diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..15a9c2f
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,120 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+export default {
+  name: 'EvaluationListDialog',
+  data() {
+    return {
+      title: '评价记录',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '评价时间 ', value: 'commentTime', align: 'center' },
+        { text: '分值', value: 'score', align: 'center' },
+        { text: '评价内容', value: 'comment', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: false, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(listQuery, toiletName) {
+      this.title = toiletName + '评价记录'
+      this.listQuery = listQuery
+      this.dialogFormVisible = true
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      ]
+      this.total = 4
+      this.listLoading = false
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..15a9c2f
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,120 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+export default {
+  name: 'EvaluationListDialog',
+  data() {
+    return {
+      title: '评价记录',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '评价时间 ', value: 'commentTime', align: 'center' },
+        { text: '分值', value: 'score', align: 'center' },
+        { text: '评价内容', value: 'comment', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: false, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(listQuery, toiletName) {
+      this.title = toiletName + '评价记录'
+      this.listQuery = listQuery
+      this.dialogFormVisible = true
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      ]
+      this.total = 4
+      this.listLoading = false
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/statistics/components/workChart.vue b/src/views/statistics/components/workChart.vue
new file mode 100644
index 0000000..a891e0c
--- /dev/null
+++ b/src/views/statistics/components/workChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"
+    :extend="extend"
+    :data-empty="dataEmpty"
+  />
+</template>
+
+<script>
+export default {
+  name: 'WorkChart',
+  props: {
+    rawdata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      chartSettings: {
+        labelMap: {
+          'count': '清洁次数',
+          'name': '时间'
+        }
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'top' },
+          itemStyle: {
+            normal: {
+              barBorderRadius: [3, 3, 0, 0]
+            }
+          },
+          barMaxWidth: 20
+        }
+      },
+      dataEmpty: false,
+      data: {
+        columns: ['name', 'count'],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    rawdata(val) {
+      this.data.rows = val
+      this.findMax(val)
+    }
+  },
+  methods: {
+    findMax(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return item.count }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = { max: maxValue + 1 }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-title{
+    margin: auto;
+    text-align: center;
+    margin-top: 15px;
+    font-size:20px;
+    font-weight:600
+  }
+  .select-right{
+    /*margin-right: 25px;*/
+    margin-top: 15px;
+    /*width: 200px*/
+  }
+</style>

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..15a9c2f
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,120 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+export default {
+  name: 'EvaluationListDialog',
+  data() {
+    return {
+      title: '评价记录',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '评价时间 ', value: 'commentTime', align: 'center' },
+        { text: '分值', value: 'score', align: 'center' },
+        { text: '评价内容', value: 'comment', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: false, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(listQuery, toiletName) {
+      this.title = toiletName + '评价记录'
+      this.listQuery = listQuery
+      this.dialogFormVisible = true
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      ]
+      this.total = 4
+      this.listLoading = false
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/statistics/components/workChart.vue b/src/views/statistics/components/workChart.vue
new file mode 100644
index 0000000..a891e0c
--- /dev/null
+++ b/src/views/statistics/components/workChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"
+    :extend="extend"
+    :data-empty="dataEmpty"
+  />
+</template>
+
+<script>
+export default {
+  name: 'WorkChart',
+  props: {
+    rawdata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      chartSettings: {
+        labelMap: {
+          'count': '清洁次数',
+          'name': '时间'
+        }
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'top' },
+          itemStyle: {
+            normal: {
+              barBorderRadius: [3, 3, 0, 0]
+            }
+          },
+          barMaxWidth: 20
+        }
+      },
+      dataEmpty: false,
+      data: {
+        columns: ['name', 'count'],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    rawdata(val) {
+      this.data.rows = val
+      this.findMax(val)
+    }
+  },
+  methods: {
+    findMax(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return item.count }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = { max: maxValue + 1 }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-title{
+    margin: auto;
+    text-align: center;
+    margin-top: 15px;
+    font-size:20px;
+    font-weight:600
+  }
+  .select-right{
+    /*margin-right: 25px;*/
+    margin-top: 15px;
+    /*width: 200px*/
+  }
+</style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
new file mode 100644
index 0000000..2193f0e
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,161 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="searchByMonth">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <!--<el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>-->
+      </template>
+      <template slot="columns">
+        <el-table-column label="平均评分" align="center">
+          <template slot-scope="scope">
+            <el-rate
+              v-model="scope.row.avgScore"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}">
+            </el-rate>
+          </template>
+        </el-table-column>
+        <el-table-column label="详细记录" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" @click="showDetail(scope.row.toiletId, scope.row.toiletName)">详细记录</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <evaluation-list-dialog ref="evaluationList"/>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '公厕编号 ', value: 'toiletName', align: 'center' },
+        { text: '公厕 ', value: 'toiletName', align: 'center' },
+        // { text: '平均分', value: 'avgScore', align: 'center' },
+        { text: '评价记录数', value: 'recordsCount', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  created() {
+    this.searchByMonth()
+  },
+  methods: {
+    searchByMonth() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
+      ]
+      this.listLoading = false
+    },
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 评价记录详情列表
+    showDetail(id,name) {
+      const listQuery = {
+        beginDate: this.listQuery.beginDate,
+        endDate: this.listQuery.endDate,
+        toiletId: id
+      }
+      this.$refs.evaluationList.initDialog(listQuery,name)
+    },
+    // 批量导出
+    batchExport() {
+      const tableName = this.timeRange[0] + '至' + this.timeRange[1] + '公厕评价统计结果.xlsx'
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..15a9c2f
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,120 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+export default {
+  name: 'EvaluationListDialog',
+  data() {
+    return {
+      title: '评价记录',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '评价时间 ', value: 'commentTime', align: 'center' },
+        { text: '分值', value: 'score', align: 'center' },
+        { text: '评价内容', value: 'comment', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: false, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(listQuery, toiletName) {
+      this.title = toiletName + '评价记录'
+      this.listQuery = listQuery
+      this.dialogFormVisible = true
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      ]
+      this.total = 4
+      this.listLoading = false
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/statistics/components/workChart.vue b/src/views/statistics/components/workChart.vue
new file mode 100644
index 0000000..a891e0c
--- /dev/null
+++ b/src/views/statistics/components/workChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"
+    :extend="extend"
+    :data-empty="dataEmpty"
+  />
+</template>
+
+<script>
+export default {
+  name: 'WorkChart',
+  props: {
+    rawdata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      chartSettings: {
+        labelMap: {
+          'count': '清洁次数',
+          'name': '时间'
+        }
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'top' },
+          itemStyle: {
+            normal: {
+              barBorderRadius: [3, 3, 0, 0]
+            }
+          },
+          barMaxWidth: 20
+        }
+      },
+      dataEmpty: false,
+      data: {
+        columns: ['name', 'count'],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    rawdata(val) {
+      this.data.rows = val
+      this.findMax(val)
+    }
+  },
+  methods: {
+    findMax(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return item.count }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = { max: maxValue + 1 }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-title{
+    margin: auto;
+    text-align: center;
+    margin-top: 15px;
+    font-size:20px;
+    font-weight:600
+  }
+  .select-right{
+    /*margin-right: 25px;*/
+    margin-top: 15px;
+    /*width: 200px*/
+  }
+</style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
new file mode 100644
index 0000000..2193f0e
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,161 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="searchByMonth">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <!--<el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>-->
+      </template>
+      <template slot="columns">
+        <el-table-column label="平均评分" align="center">
+          <template slot-scope="scope">
+            <el-rate
+              v-model="scope.row.avgScore"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}">
+            </el-rate>
+          </template>
+        </el-table-column>
+        <el-table-column label="详细记录" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" @click="showDetail(scope.row.toiletId, scope.row.toiletName)">详细记录</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <evaluation-list-dialog ref="evaluationList"/>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '公厕编号 ', value: 'toiletName', align: 'center' },
+        { text: '公厕 ', value: 'toiletName', align: 'center' },
+        // { text: '平均分', value: 'avgScore', align: 'center' },
+        { text: '评价记录数', value: 'recordsCount', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  created() {
+    this.searchByMonth()
+  },
+  methods: {
+    searchByMonth() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
+      ]
+      this.listLoading = false
+    },
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 评价记录详情列表
+    showDetail(id,name) {
+      const listQuery = {
+        beginDate: this.listQuery.beginDate,
+        endDate: this.listQuery.endDate,
+        toiletId: id
+      }
+      this.$refs.evaluationList.initDialog(listQuery,name)
+    },
+    // 批量导出
+    batchExport() {
+      const tableName = this.timeRange[0] + '至' + this.timeRange[1] + '公厕评价统计结果.xlsx'
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..2b8522a
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <el-tabs v-model="activeName" type="card" @tab-click="tabClick">
+      <el-tab-pane label="按日统计" name="byDay">
+        <search-area @search="searchByDay">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="timeRange"
+              :clearable="false"
+              :picker-options="pickerOptions"
+              size="small"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+      <el-tab-pane label="按月统计" name="byMonth">
+        <search-area @search="searchByMonth">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="year"
+              :clearable="false"
+              size="small"
+              type="year"
+              value-format="yyyy"
+              placeholder="请选择年份"
+            />
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+    </el-tabs>
+    <work-chart :rawdata="list"/>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+import WorkChart from './components/workChart'
+export default {
+  name: 'ToiletAssessment',
+  components: { WorkChart },
+  data() {
+    return {
+      activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
+      year: '2021', // 按月统计面板中的查询年份
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        type: '', // 统计方式，day按天，month按月
+        toiletCode: '', // 公厕编号
+        startTime: '', // 开始时间
+        endTime: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '时间', value: 'name', align: 'center' },
+        { text: '作业次数', value: 'count', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }// 日期快捷选项
+    }
+  },
+  created() {
+    this.searchByDay()
+  },
+  methods: {
+    // 切换面板
+    tabClick(tab, event) {
+      if (tab.name === 'byDay') {
+        this.searchByDay()
+      } else {
+        this.searchByMonth()
+      }
+    },
+    // 按月统计
+    searchByMonth() {
+      const startTime = this.year + '-01-01'
+      const endTime = this.year + '-12-31'
+      this.listQuery.type = 'month'
+      this.listQuery.startTime = startTime
+      this.listQuery.endTime = endTime
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    // 按日统计
+    searchByDay() {
+      this.listQuery.type = 'day'
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 批量导出
+    batchExport() {
+      let tableName = '公厕保洁作业统计.xlsx'
+      if (this.listQuery.type === 'day') {
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
+      } else if (this.listQuery.type === 'month') {
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
+      }
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..15a9c2f
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,120 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+export default {
+  name: 'EvaluationListDialog',
+  data() {
+    return {
+      title: '评价记录',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '评价时间 ', value: 'commentTime', align: 'center' },
+        { text: '分值', value: 'score', align: 'center' },
+        { text: '评价内容', value: 'comment', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: false, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(listQuery, toiletName) {
+      this.title = toiletName + '评价记录'
+      this.listQuery = listQuery
+      this.dialogFormVisible = true
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      ]
+      this.total = 4
+      this.listLoading = false
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/statistics/components/workChart.vue b/src/views/statistics/components/workChart.vue
new file mode 100644
index 0000000..a891e0c
--- /dev/null
+++ b/src/views/statistics/components/workChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"
+    :extend="extend"
+    :data-empty="dataEmpty"
+  />
+</template>
+
+<script>
+export default {
+  name: 'WorkChart',
+  props: {
+    rawdata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      chartSettings: {
+        labelMap: {
+          'count': '清洁次数',
+          'name': '时间'
+        }
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'top' },
+          itemStyle: {
+            normal: {
+              barBorderRadius: [3, 3, 0, 0]
+            }
+          },
+          barMaxWidth: 20
+        }
+      },
+      dataEmpty: false,
+      data: {
+        columns: ['name', 'count'],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    rawdata(val) {
+      this.data.rows = val
+      this.findMax(val)
+    }
+  },
+  methods: {
+    findMax(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return item.count }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = { max: maxValue + 1 }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-title{
+    margin: auto;
+    text-align: center;
+    margin-top: 15px;
+    font-size:20px;
+    font-weight:600
+  }
+  .select-right{
+    /*margin-right: 25px;*/
+    margin-top: 15px;
+    /*width: 200px*/
+  }
+</style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
new file mode 100644
index 0000000..2193f0e
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,161 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="searchByMonth">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <!--<el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>-->
+      </template>
+      <template slot="columns">
+        <el-table-column label="平均评分" align="center">
+          <template slot-scope="scope">
+            <el-rate
+              v-model="scope.row.avgScore"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}">
+            </el-rate>
+          </template>
+        </el-table-column>
+        <el-table-column label="详细记录" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" @click="showDetail(scope.row.toiletId, scope.row.toiletName)">详细记录</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <evaluation-list-dialog ref="evaluationList"/>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '公厕编号 ', value: 'toiletName', align: 'center' },
+        { text: '公厕 ', value: 'toiletName', align: 'center' },
+        // { text: '平均分', value: 'avgScore', align: 'center' },
+        { text: '评价记录数', value: 'recordsCount', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  created() {
+    this.searchByMonth()
+  },
+  methods: {
+    searchByMonth() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
+      ]
+      this.listLoading = false
+    },
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 评价记录详情列表
+    showDetail(id,name) {
+      const listQuery = {
+        beginDate: this.listQuery.beginDate,
+        endDate: this.listQuery.endDate,
+        toiletId: id
+      }
+      this.$refs.evaluationList.initDialog(listQuery,name)
+    },
+    // 批量导出
+    batchExport() {
+      const tableName = this.timeRange[0] + '至' + this.timeRange[1] + '公厕评价统计结果.xlsx'
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..2b8522a
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <el-tabs v-model="activeName" type="card" @tab-click="tabClick">
+      <el-tab-pane label="按日统计" name="byDay">
+        <search-area @search="searchByDay">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="timeRange"
+              :clearable="false"
+              :picker-options="pickerOptions"
+              size="small"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+      <el-tab-pane label="按月统计" name="byMonth">
+        <search-area @search="searchByMonth">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="year"
+              :clearable="false"
+              size="small"
+              type="year"
+              value-format="yyyy"
+              placeholder="请选择年份"
+            />
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+    </el-tabs>
+    <work-chart :rawdata="list"/>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+import WorkChart from './components/workChart'
+export default {
+  name: 'ToiletAssessment',
+  components: { WorkChart },
+  data() {
+    return {
+      activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
+      year: '2021', // 按月统计面板中的查询年份
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        type: '', // 统计方式，day按天，month按月
+        toiletCode: '', // 公厕编号
+        startTime: '', // 开始时间
+        endTime: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '时间', value: 'name', align: 'center' },
+        { text: '作业次数', value: 'count', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }// 日期快捷选项
+    }
+  },
+  created() {
+    this.searchByDay()
+  },
+  methods: {
+    // 切换面板
+    tabClick(tab, event) {
+      if (tab.name === 'byDay') {
+        this.searchByDay()
+      } else {
+        this.searchByMonth()
+      }
+    },
+    // 按月统计
+    searchByMonth() {
+      const startTime = this.year + '-01-01'
+      const endTime = this.year + '-12-31'
+      this.listQuery.type = 'month'
+      this.listQuery.startTime = startTime
+      this.listQuery.endTime = endTime
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    // 按日统计
+    searchByDay() {
+      this.listQuery.type = 'day'
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 批量导出
+    batchExport() {
+      let tableName = '公厕保洁作业统计.xlsx'
+      if (this.listQuery.type === 'day') {
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
+      } else if (this.listQuery.type === 'month') {
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
+      }
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
index 7864470..247c03d 100644
--- a/src/views/toilet/components/detail.vue
+++ b/src/views/toilet/components/detail.vue
@@ -115,7 +115,7 @@
   </div>
 </template>
 <script>
-import { getDetail, updateBridge } from '@/api/system/toilet'
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
 import L from 'leaflet'
 
 export default {

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..15a9c2f
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,120 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+export default {
+  name: 'EvaluationListDialog',
+  data() {
+    return {
+      title: '评价记录',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '评价时间 ', value: 'commentTime', align: 'center' },
+        { text: '分值', value: 'score', align: 'center' },
+        { text: '评价内容', value: 'comment', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: false, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(listQuery, toiletName) {
+      this.title = toiletName + '评价记录'
+      this.listQuery = listQuery
+      this.dialogFormVisible = true
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      ]
+      this.total = 4
+      this.listLoading = false
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/statistics/components/workChart.vue b/src/views/statistics/components/workChart.vue
new file mode 100644
index 0000000..a891e0c
--- /dev/null
+++ b/src/views/statistics/components/workChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"
+    :extend="extend"
+    :data-empty="dataEmpty"
+  />
+</template>
+
+<script>
+export default {
+  name: 'WorkChart',
+  props: {
+    rawdata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      chartSettings: {
+        labelMap: {
+          'count': '清洁次数',
+          'name': '时间'
+        }
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'top' },
+          itemStyle: {
+            normal: {
+              barBorderRadius: [3, 3, 0, 0]
+            }
+          },
+          barMaxWidth: 20
+        }
+      },
+      dataEmpty: false,
+      data: {
+        columns: ['name', 'count'],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    rawdata(val) {
+      this.data.rows = val
+      this.findMax(val)
+    }
+  },
+  methods: {
+    findMax(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return item.count }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = { max: maxValue + 1 }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-title{
+    margin: auto;
+    text-align: center;
+    margin-top: 15px;
+    font-size:20px;
+    font-weight:600
+  }
+  .select-right{
+    /*margin-right: 25px;*/
+    margin-top: 15px;
+    /*width: 200px*/
+  }
+</style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
new file mode 100644
index 0000000..2193f0e
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,161 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="searchByMonth">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <!--<el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>-->
+      </template>
+      <template slot="columns">
+        <el-table-column label="平均评分" align="center">
+          <template slot-scope="scope">
+            <el-rate
+              v-model="scope.row.avgScore"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}">
+            </el-rate>
+          </template>
+        </el-table-column>
+        <el-table-column label="详细记录" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" @click="showDetail(scope.row.toiletId, scope.row.toiletName)">详细记录</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <evaluation-list-dialog ref="evaluationList"/>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '公厕编号 ', value: 'toiletName', align: 'center' },
+        { text: '公厕 ', value: 'toiletName', align: 'center' },
+        // { text: '平均分', value: 'avgScore', align: 'center' },
+        { text: '评价记录数', value: 'recordsCount', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  created() {
+    this.searchByMonth()
+  },
+  methods: {
+    searchByMonth() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
+      ]
+      this.listLoading = false
+    },
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 评价记录详情列表
+    showDetail(id,name) {
+      const listQuery = {
+        beginDate: this.listQuery.beginDate,
+        endDate: this.listQuery.endDate,
+        toiletId: id
+      }
+      this.$refs.evaluationList.initDialog(listQuery,name)
+    },
+    // 批量导出
+    batchExport() {
+      const tableName = this.timeRange[0] + '至' + this.timeRange[1] + '公厕评价统计结果.xlsx'
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..2b8522a
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <el-tabs v-model="activeName" type="card" @tab-click="tabClick">
+      <el-tab-pane label="按日统计" name="byDay">
+        <search-area @search="searchByDay">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="timeRange"
+              :clearable="false"
+              :picker-options="pickerOptions"
+              size="small"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+      <el-tab-pane label="按月统计" name="byMonth">
+        <search-area @search="searchByMonth">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="year"
+              :clearable="false"
+              size="small"
+              type="year"
+              value-format="yyyy"
+              placeholder="请选择年份"
+            />
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+    </el-tabs>
+    <work-chart :rawdata="list"/>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+import WorkChart from './components/workChart'
+export default {
+  name: 'ToiletAssessment',
+  components: { WorkChart },
+  data() {
+    return {
+      activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
+      year: '2021', // 按月统计面板中的查询年份
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        type: '', // 统计方式，day按天，month按月
+        toiletCode: '', // 公厕编号
+        startTime: '', // 开始时间
+        endTime: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '时间', value: 'name', align: 'center' },
+        { text: '作业次数', value: 'count', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }// 日期快捷选项
+    }
+  },
+  created() {
+    this.searchByDay()
+  },
+  methods: {
+    // 切换面板
+    tabClick(tab, event) {
+      if (tab.name === 'byDay') {
+        this.searchByDay()
+      } else {
+        this.searchByMonth()
+      }
+    },
+    // 按月统计
+    searchByMonth() {
+      const startTime = this.year + '-01-01'
+      const endTime = this.year + '-12-31'
+      this.listQuery.type = 'month'
+      this.listQuery.startTime = startTime
+      this.listQuery.endTime = endTime
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    // 按日统计
+    searchByDay() {
+      this.listQuery.type = 'day'
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 批量导出
+    batchExport() {
+      let tableName = '公厕保洁作业统计.xlsx'
+      if (this.listQuery.type === 'day') {
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
+      } else if (this.listQuery.type === 'month') {
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
+      }
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
index 7864470..247c03d 100644
--- a/src/views/toilet/components/detail.vue
+++ b/src/views/toilet/components/detail.vue
@@ -115,7 +115,7 @@
   </div>
 </template>
 <script>
-import { getDetail, updateBridge } from '@/api/system/toilet'
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
 import L from 'leaflet'
 
 export default {
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
index 74fec71..000deea 100644
--- a/src/views/toilet/components/editToilet.vue
+++ b/src/views/toilet/components/editToilet.vue
@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import { addToilet, updateToilet } from '@/api/system/toilet'
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
 import { Uploadimg } from '@/api/common'
 import ChoosePointDialog from '../../mapViews/choosePointDialog'
 

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..15a9c2f
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,120 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+export default {
+  name: 'EvaluationListDialog',
+  data() {
+    return {
+      title: '评价记录',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '评价时间 ', value: 'commentTime', align: 'center' },
+        { text: '分值', value: 'score', align: 'center' },
+        { text: '评价内容', value: 'comment', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: false, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(listQuery, toiletName) {
+      this.title = toiletName + '评价记录'
+      this.listQuery = listQuery
+      this.dialogFormVisible = true
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      ]
+      this.total = 4
+      this.listLoading = false
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/statistics/components/workChart.vue b/src/views/statistics/components/workChart.vue
new file mode 100644
index 0000000..a891e0c
--- /dev/null
+++ b/src/views/statistics/components/workChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"
+    :extend="extend"
+    :data-empty="dataEmpty"
+  />
+</template>
+
+<script>
+export default {
+  name: 'WorkChart',
+  props: {
+    rawdata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      chartSettings: {
+        labelMap: {
+          'count': '清洁次数',
+          'name': '时间'
+        }
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'top' },
+          itemStyle: {
+            normal: {
+              barBorderRadius: [3, 3, 0, 0]
+            }
+          },
+          barMaxWidth: 20
+        }
+      },
+      dataEmpty: false,
+      data: {
+        columns: ['name', 'count'],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    rawdata(val) {
+      this.data.rows = val
+      this.findMax(val)
+    }
+  },
+  methods: {
+    findMax(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return item.count }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = { max: maxValue + 1 }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-title{
+    margin: auto;
+    text-align: center;
+    margin-top: 15px;
+    font-size:20px;
+    font-weight:600
+  }
+  .select-right{
+    /*margin-right: 25px;*/
+    margin-top: 15px;
+    /*width: 200px*/
+  }
+</style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
new file mode 100644
index 0000000..2193f0e
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,161 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="searchByMonth">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <!--<el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>-->
+      </template>
+      <template slot="columns">
+        <el-table-column label="平均评分" align="center">
+          <template slot-scope="scope">
+            <el-rate
+              v-model="scope.row.avgScore"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}">
+            </el-rate>
+          </template>
+        </el-table-column>
+        <el-table-column label="详细记录" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" @click="showDetail(scope.row.toiletId, scope.row.toiletName)">详细记录</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <evaluation-list-dialog ref="evaluationList"/>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '公厕编号 ', value: 'toiletName', align: 'center' },
+        { text: '公厕 ', value: 'toiletName', align: 'center' },
+        // { text: '平均分', value: 'avgScore', align: 'center' },
+        { text: '评价记录数', value: 'recordsCount', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  created() {
+    this.searchByMonth()
+  },
+  methods: {
+    searchByMonth() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
+      ]
+      this.listLoading = false
+    },
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 评价记录详情列表
+    showDetail(id,name) {
+      const listQuery = {
+        beginDate: this.listQuery.beginDate,
+        endDate: this.listQuery.endDate,
+        toiletId: id
+      }
+      this.$refs.evaluationList.initDialog(listQuery,name)
+    },
+    // 批量导出
+    batchExport() {
+      const tableName = this.timeRange[0] + '至' + this.timeRange[1] + '公厕评价统计结果.xlsx'
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..2b8522a
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <el-tabs v-model="activeName" type="card" @tab-click="tabClick">
+      <el-tab-pane label="按日统计" name="byDay">
+        <search-area @search="searchByDay">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="timeRange"
+              :clearable="false"
+              :picker-options="pickerOptions"
+              size="small"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+      <el-tab-pane label="按月统计" name="byMonth">
+        <search-area @search="searchByMonth">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="year"
+              :clearable="false"
+              size="small"
+              type="year"
+              value-format="yyyy"
+              placeholder="请选择年份"
+            />
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+    </el-tabs>
+    <work-chart :rawdata="list"/>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+import WorkChart from './components/workChart'
+export default {
+  name: 'ToiletAssessment',
+  components: { WorkChart },
+  data() {
+    return {
+      activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
+      year: '2021', // 按月统计面板中的查询年份
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        type: '', // 统计方式，day按天，month按月
+        toiletCode: '', // 公厕编号
+        startTime: '', // 开始时间
+        endTime: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '时间', value: 'name', align: 'center' },
+        { text: '作业次数', value: 'count', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }// 日期快捷选项
+    }
+  },
+  created() {
+    this.searchByDay()
+  },
+  methods: {
+    // 切换面板
+    tabClick(tab, event) {
+      if (tab.name === 'byDay') {
+        this.searchByDay()
+      } else {
+        this.searchByMonth()
+      }
+    },
+    // 按月统计
+    searchByMonth() {
+      const startTime = this.year + '-01-01'
+      const endTime = this.year + '-12-31'
+      this.listQuery.type = 'month'
+      this.listQuery.startTime = startTime
+      this.listQuery.endTime = endTime
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    // 按日统计
+    searchByDay() {
+      this.listQuery.type = 'day'
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 批量导出
+    batchExport() {
+      let tableName = '公厕保洁作业统计.xlsx'
+      if (this.listQuery.type === 'day') {
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
+      } else if (this.listQuery.type === 'month') {
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
+      }
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
index 7864470..247c03d 100644
--- a/src/views/toilet/components/detail.vue
+++ b/src/views/toilet/components/detail.vue
@@ -115,7 +115,7 @@
   </div>
 </template>
 <script>
-import { getDetail, updateBridge } from '@/api/system/toilet'
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
 import L from 'leaflet'
 
 export default {
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
index 74fec71..000deea 100644
--- a/src/views/toilet/components/editToilet.vue
+++ b/src/views/toilet/components/editToilet.vue
@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import { addToilet, updateToilet } from '@/api/system/toilet'
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
 import { Uploadimg } from '@/api/common'
 import ChoosePointDialog from '../../mapViews/choosePointDialog'
 
diff --git a/src/views/toilet/listToilet.vue b/src/views/toilet/listToilet.vue
index a885000..2c5209e 100644
--- a/src/views/toilet/listToilet.vue
+++ b/src/views/toilet/listToilet.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { getToiletList, delToilet } from '@/api/system/toilet'
+import { getToiletList, delToilet } from '@/api/sanitation/toilet'
 import EditToilet from './components/editToilet'
 
 export default {

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..15a9c2f
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,120 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+export default {
+  name: 'EvaluationListDialog',
+  data() {
+    return {
+      title: '评价记录',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '评价时间 ', value: 'commentTime', align: 'center' },
+        { text: '分值', value: 'score', align: 'center' },
+        { text: '评价内容', value: 'comment', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: false, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(listQuery, toiletName) {
+      this.title = toiletName + '评价记录'
+      this.listQuery = listQuery
+      this.dialogFormVisible = true
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      ]
+      this.total = 4
+      this.listLoading = false
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/statistics/components/workChart.vue b/src/views/statistics/components/workChart.vue
new file mode 100644
index 0000000..a891e0c
--- /dev/null
+++ b/src/views/statistics/components/workChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"
+    :extend="extend"
+    :data-empty="dataEmpty"
+  />
+</template>
+
+<script>
+export default {
+  name: 'WorkChart',
+  props: {
+    rawdata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      chartSettings: {
+        labelMap: {
+          'count': '清洁次数',
+          'name': '时间'
+        }
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'top' },
+          itemStyle: {
+            normal: {
+              barBorderRadius: [3, 3, 0, 0]
+            }
+          },
+          barMaxWidth: 20
+        }
+      },
+      dataEmpty: false,
+      data: {
+        columns: ['name', 'count'],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    rawdata(val) {
+      this.data.rows = val
+      this.findMax(val)
+    }
+  },
+  methods: {
+    findMax(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return item.count }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = { max: maxValue + 1 }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-title{
+    margin: auto;
+    text-align: center;
+    margin-top: 15px;
+    font-size:20px;
+    font-weight:600
+  }
+  .select-right{
+    /*margin-right: 25px;*/
+    margin-top: 15px;
+    /*width: 200px*/
+  }
+</style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
new file mode 100644
index 0000000..2193f0e
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,161 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="searchByMonth">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <!--<el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>-->
+      </template>
+      <template slot="columns">
+        <el-table-column label="平均评分" align="center">
+          <template slot-scope="scope">
+            <el-rate
+              v-model="scope.row.avgScore"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}">
+            </el-rate>
+          </template>
+        </el-table-column>
+        <el-table-column label="详细记录" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" @click="showDetail(scope.row.toiletId, scope.row.toiletName)">详细记录</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <evaluation-list-dialog ref="evaluationList"/>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '公厕编号 ', value: 'toiletName', align: 'center' },
+        { text: '公厕 ', value: 'toiletName', align: 'center' },
+        // { text: '平均分', value: 'avgScore', align: 'center' },
+        { text: '评价记录数', value: 'recordsCount', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  created() {
+    this.searchByMonth()
+  },
+  methods: {
+    searchByMonth() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
+      ]
+      this.listLoading = false
+    },
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 评价记录详情列表
+    showDetail(id,name) {
+      const listQuery = {
+        beginDate: this.listQuery.beginDate,
+        endDate: this.listQuery.endDate,
+        toiletId: id
+      }
+      this.$refs.evaluationList.initDialog(listQuery,name)
+    },
+    // 批量导出
+    batchExport() {
+      const tableName = this.timeRange[0] + '至' + this.timeRange[1] + '公厕评价统计结果.xlsx'
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..2b8522a
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <el-tabs v-model="activeName" type="card" @tab-click="tabClick">
+      <el-tab-pane label="按日统计" name="byDay">
+        <search-area @search="searchByDay">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="timeRange"
+              :clearable="false"
+              :picker-options="pickerOptions"
+              size="small"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+      <el-tab-pane label="按月统计" name="byMonth">
+        <search-area @search="searchByMonth">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="year"
+              :clearable="false"
+              size="small"
+              type="year"
+              value-format="yyyy"
+              placeholder="请选择年份"
+            />
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+    </el-tabs>
+    <work-chart :rawdata="list"/>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+import WorkChart from './components/workChart'
+export default {
+  name: 'ToiletAssessment',
+  components: { WorkChart },
+  data() {
+    return {
+      activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
+      year: '2021', // 按月统计面板中的查询年份
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        type: '', // 统计方式，day按天，month按月
+        toiletCode: '', // 公厕编号
+        startTime: '', // 开始时间
+        endTime: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '时间', value: 'name', align: 'center' },
+        { text: '作业次数', value: 'count', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }// 日期快捷选项
+    }
+  },
+  created() {
+    this.searchByDay()
+  },
+  methods: {
+    // 切换面板
+    tabClick(tab, event) {
+      if (tab.name === 'byDay') {
+        this.searchByDay()
+      } else {
+        this.searchByMonth()
+      }
+    },
+    // 按月统计
+    searchByMonth() {
+      const startTime = this.year + '-01-01'
+      const endTime = this.year + '-12-31'
+      this.listQuery.type = 'month'
+      this.listQuery.startTime = startTime
+      this.listQuery.endTime = endTime
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    // 按日统计
+    searchByDay() {
+      this.listQuery.type = 'day'
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 批量导出
+    batchExport() {
+      let tableName = '公厕保洁作业统计.xlsx'
+      if (this.listQuery.type === 'day') {
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
+      } else if (this.listQuery.type === 'month') {
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
+      }
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
index 7864470..247c03d 100644
--- a/src/views/toilet/components/detail.vue
+++ b/src/views/toilet/components/detail.vue
@@ -115,7 +115,7 @@
   </div>
 </template>
 <script>
-import { getDetail, updateBridge } from '@/api/system/toilet'
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
 import L from 'leaflet'
 
 export default {
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
index 74fec71..000deea 100644
--- a/src/views/toilet/components/editToilet.vue
+++ b/src/views/toilet/components/editToilet.vue
@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import { addToilet, updateToilet } from '@/api/system/toilet'
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
 import { Uploadimg } from '@/api/common'
 import ChoosePointDialog from '../../mapViews/choosePointDialog'
 
diff --git a/src/views/toilet/listToilet.vue b/src/views/toilet/listToilet.vue
index a885000..2c5209e 100644
--- a/src/views/toilet/listToilet.vue
+++ b/src/views/toilet/listToilet.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { getToiletList, delToilet } from '@/api/system/toilet'
+import { getToiletList, delToilet } from '@/api/sanitation/toilet'
 import EditToilet from './components/editToilet'
 
 export default {
diff --git a/src/views/toilet/listWork.vue b/src/views/toilet/listWork.vue
index 32d3409..a8cf3a0 100644
--- a/src/views/toilet/listWork.vue
+++ b/src/views/toilet/listWork.vue
@@ -45,7 +45,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/system/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ListWork',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..15a9c2f
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,120 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+export default {
+  name: 'EvaluationListDialog',
+  data() {
+    return {
+      title: '评价记录',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '评价时间 ', value: 'commentTime', align: 'center' },
+        { text: '分值', value: 'score', align: 'center' },
+        { text: '评价内容', value: 'comment', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: false, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(listQuery, toiletName) {
+      this.title = toiletName + '评价记录'
+      this.listQuery = listQuery
+      this.dialogFormVisible = true
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      ]
+      this.total = 4
+      this.listLoading = false
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/statistics/components/workChart.vue b/src/views/statistics/components/workChart.vue
new file mode 100644
index 0000000..a891e0c
--- /dev/null
+++ b/src/views/statistics/components/workChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"
+    :extend="extend"
+    :data-empty="dataEmpty"
+  />
+</template>
+
+<script>
+export default {
+  name: 'WorkChart',
+  props: {
+    rawdata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      chartSettings: {
+        labelMap: {
+          'count': '清洁次数',
+          'name': '时间'
+        }
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'top' },
+          itemStyle: {
+            normal: {
+              barBorderRadius: [3, 3, 0, 0]
+            }
+          },
+          barMaxWidth: 20
+        }
+      },
+      dataEmpty: false,
+      data: {
+        columns: ['name', 'count'],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    rawdata(val) {
+      this.data.rows = val
+      this.findMax(val)
+    }
+  },
+  methods: {
+    findMax(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return item.count }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = { max: maxValue + 1 }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-title{
+    margin: auto;
+    text-align: center;
+    margin-top: 15px;
+    font-size:20px;
+    font-weight:600
+  }
+  .select-right{
+    /*margin-right: 25px;*/
+    margin-top: 15px;
+    /*width: 200px*/
+  }
+</style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
new file mode 100644
index 0000000..2193f0e
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,161 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="searchByMonth">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <!--<el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>-->
+      </template>
+      <template slot="columns">
+        <el-table-column label="平均评分" align="center">
+          <template slot-scope="scope">
+            <el-rate
+              v-model="scope.row.avgScore"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}">
+            </el-rate>
+          </template>
+        </el-table-column>
+        <el-table-column label="详细记录" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" @click="showDetail(scope.row.toiletId, scope.row.toiletName)">详细记录</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <evaluation-list-dialog ref="evaluationList"/>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '公厕编号 ', value: 'toiletName', align: 'center' },
+        { text: '公厕 ', value: 'toiletName', align: 'center' },
+        // { text: '平均分', value: 'avgScore', align: 'center' },
+        { text: '评价记录数', value: 'recordsCount', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  created() {
+    this.searchByMonth()
+  },
+  methods: {
+    searchByMonth() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
+      ]
+      this.listLoading = false
+    },
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 评价记录详情列表
+    showDetail(id,name) {
+      const listQuery = {
+        beginDate: this.listQuery.beginDate,
+        endDate: this.listQuery.endDate,
+        toiletId: id
+      }
+      this.$refs.evaluationList.initDialog(listQuery,name)
+    },
+    // 批量导出
+    batchExport() {
+      const tableName = this.timeRange[0] + '至' + this.timeRange[1] + '公厕评价统计结果.xlsx'
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..2b8522a
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <el-tabs v-model="activeName" type="card" @tab-click="tabClick">
+      <el-tab-pane label="按日统计" name="byDay">
+        <search-area @search="searchByDay">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="timeRange"
+              :clearable="false"
+              :picker-options="pickerOptions"
+              size="small"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+      <el-tab-pane label="按月统计" name="byMonth">
+        <search-area @search="searchByMonth">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="year"
+              :clearable="false"
+              size="small"
+              type="year"
+              value-format="yyyy"
+              placeholder="请选择年份"
+            />
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+    </el-tabs>
+    <work-chart :rawdata="list"/>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+import WorkChart from './components/workChart'
+export default {
+  name: 'ToiletAssessment',
+  components: { WorkChart },
+  data() {
+    return {
+      activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
+      year: '2021', // 按月统计面板中的查询年份
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        type: '', // 统计方式，day按天，month按月
+        toiletCode: '', // 公厕编号
+        startTime: '', // 开始时间
+        endTime: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '时间', value: 'name', align: 'center' },
+        { text: '作业次数', value: 'count', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }// 日期快捷选项
+    }
+  },
+  created() {
+    this.searchByDay()
+  },
+  methods: {
+    // 切换面板
+    tabClick(tab, event) {
+      if (tab.name === 'byDay') {
+        this.searchByDay()
+      } else {
+        this.searchByMonth()
+      }
+    },
+    // 按月统计
+    searchByMonth() {
+      const startTime = this.year + '-01-01'
+      const endTime = this.year + '-12-31'
+      this.listQuery.type = 'month'
+      this.listQuery.startTime = startTime
+      this.listQuery.endTime = endTime
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    // 按日统计
+    searchByDay() {
+      this.listQuery.type = 'day'
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 批量导出
+    batchExport() {
+      let tableName = '公厕保洁作业统计.xlsx'
+      if (this.listQuery.type === 'day') {
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
+      } else if (this.listQuery.type === 'month') {
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
+      }
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
index 7864470..247c03d 100644
--- a/src/views/toilet/components/detail.vue
+++ b/src/views/toilet/components/detail.vue
@@ -115,7 +115,7 @@
   </div>
 </template>
 <script>
-import { getDetail, updateBridge } from '@/api/system/toilet'
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
 import L from 'leaflet'
 
 export default {
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
index 74fec71..000deea 100644
--- a/src/views/toilet/components/editToilet.vue
+++ b/src/views/toilet/components/editToilet.vue
@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import { addToilet, updateToilet } from '@/api/system/toilet'
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
 import { Uploadimg } from '@/api/common'
 import ChoosePointDialog from '../../mapViews/choosePointDialog'
 
diff --git a/src/views/toilet/listToilet.vue b/src/views/toilet/listToilet.vue
index a885000..2c5209e 100644
--- a/src/views/toilet/listToilet.vue
+++ b/src/views/toilet/listToilet.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { getToiletList, delToilet } from '@/api/system/toilet'
+import { getToiletList, delToilet } from '@/api/sanitation/toilet'
 import EditToilet from './components/editToilet'
 
 export default {
diff --git a/src/views/toilet/listWork.vue b/src/views/toilet/listWork.vue
index 32d3409..a8cf3a0 100644
--- a/src/views/toilet/listWork.vue
+++ b/src/views/toilet/listWork.vue
@@ -45,7 +45,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/system/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ListWork',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
new file mode 100644
index 0000000..1e4af18
--- /dev/null
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -0,0 +1,207 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.tolietKeywords" size="small" placeholder="公厕编号/名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" size="small" placeholder="作业人" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.jobContent" size="small" placeholder="作业内容" clearable/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          size="small"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
+      <template slot="btns">
+        <el-button v-if="hasPerm('/sanitation/job/export/toilet')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="80">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>&ndash;&gt;-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletCleanList',
+  data() {
+    return {
+      dateRange: [], // 日期范围
+      listQuery: {
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        startTime: '', // 开始日期
+        tolietKeywords: '', // 公厕编号/名称
+        endTime: '', // 结束日期
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: 'desc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '作业人',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '公厕编号',
+          value: 'toiletCode',
+          align: 'center'
+        },
+        {
+          text: '公厕名称',
+          value: 'toiletName',
+          align: 'center'
+        },
+        {
+          text: '公厕位置',
+          value: 'toiletPosition',
+          align: 'center'
+        },
+        {
+          text: '作业内容',
+          value: 'jobContent',
+          align: 'center'
+        },
+        {
+          text: '作业时间',
+          value: 'startTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [],
+      fileList: [],
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      editShow: false // 编辑页面是否显示
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      if (this.dateRange.length > 0) {
+        this.listQuery.startTime = this.dateRange[0]
+        this.listQuery.endTime = this.dateRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
+    },
+    // 点击详情
+    goDetail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportToiletJobRecords(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `公厕保洁记录.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    // 重置后的操作， 若不需要显示重置按钮则不需要写
+    clearInput() {
+      this.listQuery = {
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        tolietKeywords: '', // 公厕编号/名称
+        startTime: '', // 开始日期
+        endTime: '', // 结束日期
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: 'desc'
+      }
+      this.dateRange = []
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..15a9c2f
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,120 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+export default {
+  name: 'EvaluationListDialog',
+  data() {
+    return {
+      title: '评价记录',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '评价时间 ', value: 'commentTime', align: 'center' },
+        { text: '分值', value: 'score', align: 'center' },
+        { text: '评价内容', value: 'comment', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: false, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(listQuery, toiletName) {
+      this.title = toiletName + '评价记录'
+      this.listQuery = listQuery
+      this.dialogFormVisible = true
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      ]
+      this.total = 4
+      this.listLoading = false
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/statistics/components/workChart.vue b/src/views/statistics/components/workChart.vue
new file mode 100644
index 0000000..a891e0c
--- /dev/null
+++ b/src/views/statistics/components/workChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"
+    :extend="extend"
+    :data-empty="dataEmpty"
+  />
+</template>
+
+<script>
+export default {
+  name: 'WorkChart',
+  props: {
+    rawdata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      chartSettings: {
+        labelMap: {
+          'count': '清洁次数',
+          'name': '时间'
+        }
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'top' },
+          itemStyle: {
+            normal: {
+              barBorderRadius: [3, 3, 0, 0]
+            }
+          },
+          barMaxWidth: 20
+        }
+      },
+      dataEmpty: false,
+      data: {
+        columns: ['name', 'count'],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    rawdata(val) {
+      this.data.rows = val
+      this.findMax(val)
+    }
+  },
+  methods: {
+    findMax(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return item.count }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = { max: maxValue + 1 }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-title{
+    margin: auto;
+    text-align: center;
+    margin-top: 15px;
+    font-size:20px;
+    font-weight:600
+  }
+  .select-right{
+    /*margin-right: 25px;*/
+    margin-top: 15px;
+    /*width: 200px*/
+  }
+</style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
new file mode 100644
index 0000000..2193f0e
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,161 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="searchByMonth">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <!--<el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>-->
+      </template>
+      <template slot="columns">
+        <el-table-column label="平均评分" align="center">
+          <template slot-scope="scope">
+            <el-rate
+              v-model="scope.row.avgScore"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}">
+            </el-rate>
+          </template>
+        </el-table-column>
+        <el-table-column label="详细记录" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" @click="showDetail(scope.row.toiletId, scope.row.toiletName)">详细记录</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <evaluation-list-dialog ref="evaluationList"/>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '公厕编号 ', value: 'toiletName', align: 'center' },
+        { text: '公厕 ', value: 'toiletName', align: 'center' },
+        // { text: '平均分', value: 'avgScore', align: 'center' },
+        { text: '评价记录数', value: 'recordsCount', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  created() {
+    this.searchByMonth()
+  },
+  methods: {
+    searchByMonth() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
+      ]
+      this.listLoading = false
+    },
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 评价记录详情列表
+    showDetail(id,name) {
+      const listQuery = {
+        beginDate: this.listQuery.beginDate,
+        endDate: this.listQuery.endDate,
+        toiletId: id
+      }
+      this.$refs.evaluationList.initDialog(listQuery,name)
+    },
+    // 批量导出
+    batchExport() {
+      const tableName = this.timeRange[0] + '至' + this.timeRange[1] + '公厕评价统计结果.xlsx'
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..2b8522a
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <el-tabs v-model="activeName" type="card" @tab-click="tabClick">
+      <el-tab-pane label="按日统计" name="byDay">
+        <search-area @search="searchByDay">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="timeRange"
+              :clearable="false"
+              :picker-options="pickerOptions"
+              size="small"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+      <el-tab-pane label="按月统计" name="byMonth">
+        <search-area @search="searchByMonth">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="year"
+              :clearable="false"
+              size="small"
+              type="year"
+              value-format="yyyy"
+              placeholder="请选择年份"
+            />
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+    </el-tabs>
+    <work-chart :rawdata="list"/>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+import WorkChart from './components/workChart'
+export default {
+  name: 'ToiletAssessment',
+  components: { WorkChart },
+  data() {
+    return {
+      activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
+      year: '2021', // 按月统计面板中的查询年份
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        type: '', // 统计方式，day按天，month按月
+        toiletCode: '', // 公厕编号
+        startTime: '', // 开始时间
+        endTime: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '时间', value: 'name', align: 'center' },
+        { text: '作业次数', value: 'count', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }// 日期快捷选项
+    }
+  },
+  created() {
+    this.searchByDay()
+  },
+  methods: {
+    // 切换面板
+    tabClick(tab, event) {
+      if (tab.name === 'byDay') {
+        this.searchByDay()
+      } else {
+        this.searchByMonth()
+      }
+    },
+    // 按月统计
+    searchByMonth() {
+      const startTime = this.year + '-01-01'
+      const endTime = this.year + '-12-31'
+      this.listQuery.type = 'month'
+      this.listQuery.startTime = startTime
+      this.listQuery.endTime = endTime
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    // 按日统计
+    searchByDay() {
+      this.listQuery.type = 'day'
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 批量导出
+    batchExport() {
+      let tableName = '公厕保洁作业统计.xlsx'
+      if (this.listQuery.type === 'day') {
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
+      } else if (this.listQuery.type === 'month') {
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
+      }
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
index 7864470..247c03d 100644
--- a/src/views/toilet/components/detail.vue
+++ b/src/views/toilet/components/detail.vue
@@ -115,7 +115,7 @@
   </div>
 </template>
 <script>
-import { getDetail, updateBridge } from '@/api/system/toilet'
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
 import L from 'leaflet'
 
 export default {
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
index 74fec71..000deea 100644
--- a/src/views/toilet/components/editToilet.vue
+++ b/src/views/toilet/components/editToilet.vue
@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import { addToilet, updateToilet } from '@/api/system/toilet'
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
 import { Uploadimg } from '@/api/common'
 import ChoosePointDialog from '../../mapViews/choosePointDialog'
 
diff --git a/src/views/toilet/listToilet.vue b/src/views/toilet/listToilet.vue
index a885000..2c5209e 100644
--- a/src/views/toilet/listToilet.vue
+++ b/src/views/toilet/listToilet.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { getToiletList, delToilet } from '@/api/system/toilet'
+import { getToiletList, delToilet } from '@/api/sanitation/toilet'
 import EditToilet from './components/editToilet'
 
 export default {
diff --git a/src/views/toilet/listWork.vue b/src/views/toilet/listWork.vue
index 32d3409..a8cf3a0 100644
--- a/src/views/toilet/listWork.vue
+++ b/src/views/toilet/listWork.vue
@@ -45,7 +45,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/system/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ListWork',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
new file mode 100644
index 0000000..1e4af18
--- /dev/null
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -0,0 +1,207 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.tolietKeywords" size="small" placeholder="公厕编号/名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" size="small" placeholder="作业人" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.jobContent" size="small" placeholder="作业内容" clearable/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          size="small"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
+      <template slot="btns">
+        <el-button v-if="hasPerm('/sanitation/job/export/toilet')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="80">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>&ndash;&gt;-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletCleanList',
+  data() {
+    return {
+      dateRange: [], // 日期范围
+      listQuery: {
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        startTime: '', // 开始日期
+        tolietKeywords: '', // 公厕编号/名称
+        endTime: '', // 结束日期
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: 'desc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '作业人',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '公厕编号',
+          value: 'toiletCode',
+          align: 'center'
+        },
+        {
+          text: '公厕名称',
+          value: 'toiletName',
+          align: 'center'
+        },
+        {
+          text: '公厕位置',
+          value: 'toiletPosition',
+          align: 'center'
+        },
+        {
+          text: '作业内容',
+          value: 'jobContent',
+          align: 'center'
+        },
+        {
+          text: '作业时间',
+          value: 'startTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [],
+      fileList: [],
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      editShow: false // 编辑页面是否显示
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      if (this.dateRange.length > 0) {
+        this.listQuery.startTime = this.dateRange[0]
+        this.listQuery.endTime = this.dateRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
+    },
+    // 点击详情
+    goDetail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportToiletJobRecords(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `公厕保洁记录.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    // 重置后的操作， 若不需要显示重置按钮则不需要写
+    clearInput() {
+      this.listQuery = {
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        tolietKeywords: '', // 公厕编号/名称
+        startTime: '', // 开始日期
+        endTime: '', // 结束日期
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: 'desc'
+      }
+      this.dateRange = []
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/toiletManage/editToilet.vue b/src/views/toiletManage/editToilet.vue
new file mode 100644
index 0000000..e797eec
--- /dev/null
+++ b/src/views/toiletManage/editToilet.vue
@@ -0,0 +1,408 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :fullscreen="false" width="60%" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="toiletForm" label-well-code="right" label-width="100px">
+      <div class="form-div">
+        <div class="form-left">
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="编号" prop="code">
+                <el-input v-model.trim="toiletForm.code" :disabled="isDetailMode" type="text" placeholder="必填"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model.trim="toiletForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="占地面积" prop="area">
+                <el-input v-model.trim="toiletForm.area" :disabled="isDetailMode" type="text" placeholder="必填"/>
+                <!--<el-select v-model="toiletForm.type" :disabled="isDetailMode" placeholder="请选择公厕类别">-->
+                <!--<el-option-->
+                <!--v-for="item in typeList"-->
+                <!--:key="item.value"-->
+                <!--:label="item.name"-->
+                <!--:value="item.value"/>-->
+                <!--</el-select>-->
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="位置" prop="position">
+                <el-input v-model.trim="toiletForm.position" :disabled="isDetailMode" type="text" placeholder="社区/道路"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="经度" prop="lng">
+                <el-input v-model.trim="toiletForm.lng" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="纬度" prop="lat">
+                <el-input v-model.trim="toiletForm.lat" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="责任人" prop="responsiblePerson">
+                <el-input v-model.trim="toiletForm.responsiblePerson" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="责任人电话" prop="responsiblePersonTel">
+                <el-input v-model.trim="toiletForm.responsiblePersonTel" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="建设单位" prop="owner">
+                <el-input v-model.trim="toiletForm.owner" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="建设时间" prop="ts">
+                <el-date-picker
+                  v-model.trim="toiletForm.ts"
+                  :disabled="isDetailMode"
+                  type="date"
+                  value-format="yyyy-MM-dd
+"
+                  placeholder="选择建设时间"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="24">
+              <el-form-item label="备注" prop="notes">
+                <el-input v-model.trim="toiletForm.notes" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!--右边照片-->
+        <div class="form-right">
+          <el-row>
+            <div class="avatar">
+              <el-image
+                :src="photo!==''?photo:defaultPhoto"
+                fit="cover"
+                style="width: 130px; height: 175px"/>
+            </div>
+          </el-row>
+          <el-row>
+            <el-upload
+              v-show="!isDetailMode"
+              ref="upload"
+              :before-upload="handleBeforeUpload"
+              :on-success="handleSuccess"
+              :http-request="uploadFile"
+              :show-file-list="false"
+              class="avatar-uploader"
+              action="string"
+              accept=".jpg,.jpeg,.png">
+              <el-button type="primary">点击上传照片</el-button>
+            </el-upload>
+            <el-button v-show="!isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('edit')">地图选点</el-button>
+            <el-button v-show="isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('readonly')">查看地图</el-button>
+          </el-row>
+        </div>
+      </div>
+
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+
+    <choose-point-dialog ref="choosepoint" @choose="chooseOver"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+import { Uploadimg } from '@/api/common'
+import ChoosePointDialog from '../mapViews/choosePointDialog'
+
+export default {
+  name: 'EditToilet',
+  components: { ChoosePointDialog },
+  data() {
+    return {
+      baseUrl: this.baseConfig.baseUrl + '/static/',
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      toiletForm: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      sexList: [
+        { name: '男', value: '0' },
+        { name: '女', value: '1' }
+      ], // 性别列表
+      typeList: [],
+      rules: {
+        code: [{ required: true, message: '编号不能为空', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, message: '位置不能为空', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false, // 详情模式
+      canEdit: true
+    }
+  },
+  created() {
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param dialogStatus 对话框类型
+     * @param dialogFormVisible 对话框是否可见
+     * @param row 内容参数（编辑和详情需要）
+     */
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.toiletForm = {
+          id: row.id, // id
+          code: row.code, // 编号
+          name: row.name, // 名称
+          position: row.position, // 位置：社区/道路
+          lng: row.lng, // 经度
+          lat: row.lat, // 纬度
+          owner: row.owner, // 建设单位
+          area: row.area, // 占地面积
+          responsiblePerson: row.responsiblePerson, // 责任人
+          responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
+          notes: row.notes // 备注
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.toiletForm = {
+          id: row.id, // id
+          code: row.code, // 编号
+          name: row.name, // 名称
+          position: row.position, // 位置：社区/道路
+          lng: row.lng, // 经度
+          lat: row.lat, // 纬度
+          owner: row.owner, // 建设单位
+          area: row.area, // 占地面积
+          responsiblePerson: row.responsiblePerson, // 责任人
+          responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          photo: row.photo, // 照片
+          ts: row.ts, // 启用时间
+          notes: row.notes // 备注
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+      if (this.toiletForm.photo && this.toiletForm.photo !== '') {
+        this.photo = this.baseUrl + this.toiletForm.photo
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.toiletForm = {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '', // 备注
+        photo: ''
+      }
+      this.photo = ''
+    },
+    // 保存数据
+    saveData: function() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        if (this.photo.startsWith('http')) { // 上传的普通图片
+          let index = this.photo.indexOf('/static/')
+          if (index !== -1) {
+            index += 8
+          }
+          this.toiletForm.photo = this.photo.substring(index)
+        }
+      }
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.canEdit = false
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.toiletForm)
+        if (valid) {
+          addToilet(this.toiletForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                  this.canEdit = true
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+                this.canEdit = true
+              })
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
+        } else {
+          this.canEdit = true
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.canEdit = false
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateToilet(this.toiletForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+              this.canEdit = true
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
+        } else {
+          this.canEdit = true
+        }
+      })
+    },
+    // 图片上传
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.photo = this.baseUrl + res.data
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      if (response.code === 200) {
+        this.photo = this.baseUrl + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    // 打开地图选点
+    choosePoint(type) {
+      let position = null
+      if (this.toiletForm.lng && this.toiletForm.lat) {
+        position = { lng: this.toiletForm.lng, lat: this.toiletForm.lat }
+      }
+      this.$refs.choosepoint.initDialog(type, position)
+    },
+    // 地图选点完毕
+    chooseOver(marker) {
+      this.$set(this.toiletForm, 'lng', marker.lng)
+      this.$set(this.toiletForm, 'lat', marker.lat)
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..15a9c2f
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,120 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+export default {
+  name: 'EvaluationListDialog',
+  data() {
+    return {
+      title: '评价记录',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '评价时间 ', value: 'commentTime', align: 'center' },
+        { text: '分值', value: 'score', align: 'center' },
+        { text: '评价内容', value: 'comment', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: false, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(listQuery, toiletName) {
+      this.title = toiletName + '评价记录'
+      this.listQuery = listQuery
+      this.dialogFormVisible = true
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      ]
+      this.total = 4
+      this.listLoading = false
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/statistics/components/workChart.vue b/src/views/statistics/components/workChart.vue
new file mode 100644
index 0000000..a891e0c
--- /dev/null
+++ b/src/views/statistics/components/workChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"
+    :extend="extend"
+    :data-empty="dataEmpty"
+  />
+</template>
+
+<script>
+export default {
+  name: 'WorkChart',
+  props: {
+    rawdata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      chartSettings: {
+        labelMap: {
+          'count': '清洁次数',
+          'name': '时间'
+        }
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'top' },
+          itemStyle: {
+            normal: {
+              barBorderRadius: [3, 3, 0, 0]
+            }
+          },
+          barMaxWidth: 20
+        }
+      },
+      dataEmpty: false,
+      data: {
+        columns: ['name', 'count'],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    rawdata(val) {
+      this.data.rows = val
+      this.findMax(val)
+    }
+  },
+  methods: {
+    findMax(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return item.count }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = { max: maxValue + 1 }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-title{
+    margin: auto;
+    text-align: center;
+    margin-top: 15px;
+    font-size:20px;
+    font-weight:600
+  }
+  .select-right{
+    /*margin-right: 25px;*/
+    margin-top: 15px;
+    /*width: 200px*/
+  }
+</style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
new file mode 100644
index 0000000..2193f0e
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,161 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="searchByMonth">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <!--<el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>-->
+      </template>
+      <template slot="columns">
+        <el-table-column label="平均评分" align="center">
+          <template slot-scope="scope">
+            <el-rate
+              v-model="scope.row.avgScore"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}">
+            </el-rate>
+          </template>
+        </el-table-column>
+        <el-table-column label="详细记录" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" @click="showDetail(scope.row.toiletId, scope.row.toiletName)">详细记录</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <evaluation-list-dialog ref="evaluationList"/>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '公厕编号 ', value: 'toiletName', align: 'center' },
+        { text: '公厕 ', value: 'toiletName', align: 'center' },
+        // { text: '平均分', value: 'avgScore', align: 'center' },
+        { text: '评价记录数', value: 'recordsCount', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  created() {
+    this.searchByMonth()
+  },
+  methods: {
+    searchByMonth() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
+      ]
+      this.listLoading = false
+    },
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 评价记录详情列表
+    showDetail(id,name) {
+      const listQuery = {
+        beginDate: this.listQuery.beginDate,
+        endDate: this.listQuery.endDate,
+        toiletId: id
+      }
+      this.$refs.evaluationList.initDialog(listQuery,name)
+    },
+    // 批量导出
+    batchExport() {
+      const tableName = this.timeRange[0] + '至' + this.timeRange[1] + '公厕评价统计结果.xlsx'
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..2b8522a
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <el-tabs v-model="activeName" type="card" @tab-click="tabClick">
+      <el-tab-pane label="按日统计" name="byDay">
+        <search-area @search="searchByDay">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="timeRange"
+              :clearable="false"
+              :picker-options="pickerOptions"
+              size="small"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+      <el-tab-pane label="按月统计" name="byMonth">
+        <search-area @search="searchByMonth">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="year"
+              :clearable="false"
+              size="small"
+              type="year"
+              value-format="yyyy"
+              placeholder="请选择年份"
+            />
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+    </el-tabs>
+    <work-chart :rawdata="list"/>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+import WorkChart from './components/workChart'
+export default {
+  name: 'ToiletAssessment',
+  components: { WorkChart },
+  data() {
+    return {
+      activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
+      year: '2021', // 按月统计面板中的查询年份
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        type: '', // 统计方式，day按天，month按月
+        toiletCode: '', // 公厕编号
+        startTime: '', // 开始时间
+        endTime: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '时间', value: 'name', align: 'center' },
+        { text: '作业次数', value: 'count', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }// 日期快捷选项
+    }
+  },
+  created() {
+    this.searchByDay()
+  },
+  methods: {
+    // 切换面板
+    tabClick(tab, event) {
+      if (tab.name === 'byDay') {
+        this.searchByDay()
+      } else {
+        this.searchByMonth()
+      }
+    },
+    // 按月统计
+    searchByMonth() {
+      const startTime = this.year + '-01-01'
+      const endTime = this.year + '-12-31'
+      this.listQuery.type = 'month'
+      this.listQuery.startTime = startTime
+      this.listQuery.endTime = endTime
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    // 按日统计
+    searchByDay() {
+      this.listQuery.type = 'day'
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 批量导出
+    batchExport() {
+      let tableName = '公厕保洁作业统计.xlsx'
+      if (this.listQuery.type === 'day') {
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
+      } else if (this.listQuery.type === 'month') {
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
+      }
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
index 7864470..247c03d 100644
--- a/src/views/toilet/components/detail.vue
+++ b/src/views/toilet/components/detail.vue
@@ -115,7 +115,7 @@
   </div>
 </template>
 <script>
-import { getDetail, updateBridge } from '@/api/system/toilet'
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
 import L from 'leaflet'
 
 export default {
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
index 74fec71..000deea 100644
--- a/src/views/toilet/components/editToilet.vue
+++ b/src/views/toilet/components/editToilet.vue
@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import { addToilet, updateToilet } from '@/api/system/toilet'
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
 import { Uploadimg } from '@/api/common'
 import ChoosePointDialog from '../../mapViews/choosePointDialog'
 
diff --git a/src/views/toilet/listToilet.vue b/src/views/toilet/listToilet.vue
index a885000..2c5209e 100644
--- a/src/views/toilet/listToilet.vue
+++ b/src/views/toilet/listToilet.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { getToiletList, delToilet } from '@/api/system/toilet'
+import { getToiletList, delToilet } from '@/api/sanitation/toilet'
 import EditToilet from './components/editToilet'
 
 export default {
diff --git a/src/views/toilet/listWork.vue b/src/views/toilet/listWork.vue
index 32d3409..a8cf3a0 100644
--- a/src/views/toilet/listWork.vue
+++ b/src/views/toilet/listWork.vue
@@ -45,7 +45,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/system/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ListWork',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
new file mode 100644
index 0000000..1e4af18
--- /dev/null
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -0,0 +1,207 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.tolietKeywords" size="small" placeholder="公厕编号/名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" size="small" placeholder="作业人" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.jobContent" size="small" placeholder="作业内容" clearable/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          size="small"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
+      <template slot="btns">
+        <el-button v-if="hasPerm('/sanitation/job/export/toilet')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="80">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>&ndash;&gt;-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletCleanList',
+  data() {
+    return {
+      dateRange: [], // 日期范围
+      listQuery: {
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        startTime: '', // 开始日期
+        tolietKeywords: '', // 公厕编号/名称
+        endTime: '', // 结束日期
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: 'desc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '作业人',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '公厕编号',
+          value: 'toiletCode',
+          align: 'center'
+        },
+        {
+          text: '公厕名称',
+          value: 'toiletName',
+          align: 'center'
+        },
+        {
+          text: '公厕位置',
+          value: 'toiletPosition',
+          align: 'center'
+        },
+        {
+          text: '作业内容',
+          value: 'jobContent',
+          align: 'center'
+        },
+        {
+          text: '作业时间',
+          value: 'startTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [],
+      fileList: [],
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      editShow: false // 编辑页面是否显示
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      if (this.dateRange.length > 0) {
+        this.listQuery.startTime = this.dateRange[0]
+        this.listQuery.endTime = this.dateRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
+    },
+    // 点击详情
+    goDetail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportToiletJobRecords(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `公厕保洁记录.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    // 重置后的操作， 若不需要显示重置按钮则不需要写
+    clearInput() {
+      this.listQuery = {
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        tolietKeywords: '', // 公厕编号/名称
+        startTime: '', // 开始日期
+        endTime: '', // 结束日期
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: 'desc'
+      }
+      this.dateRange = []
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/toiletManage/editToilet.vue b/src/views/toiletManage/editToilet.vue
new file mode 100644
index 0000000..e797eec
--- /dev/null
+++ b/src/views/toiletManage/editToilet.vue
@@ -0,0 +1,408 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :fullscreen="false" width="60%" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="toiletForm" label-well-code="right" label-width="100px">
+      <div class="form-div">
+        <div class="form-left">
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="编号" prop="code">
+                <el-input v-model.trim="toiletForm.code" :disabled="isDetailMode" type="text" placeholder="必填"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model.trim="toiletForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="占地面积" prop="area">
+                <el-input v-model.trim="toiletForm.area" :disabled="isDetailMode" type="text" placeholder="必填"/>
+                <!--<el-select v-model="toiletForm.type" :disabled="isDetailMode" placeholder="请选择公厕类别">-->
+                <!--<el-option-->
+                <!--v-for="item in typeList"-->
+                <!--:key="item.value"-->
+                <!--:label="item.name"-->
+                <!--:value="item.value"/>-->
+                <!--</el-select>-->
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="位置" prop="position">
+                <el-input v-model.trim="toiletForm.position" :disabled="isDetailMode" type="text" placeholder="社区/道路"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="经度" prop="lng">
+                <el-input v-model.trim="toiletForm.lng" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="纬度" prop="lat">
+                <el-input v-model.trim="toiletForm.lat" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="责任人" prop="responsiblePerson">
+                <el-input v-model.trim="toiletForm.responsiblePerson" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="责任人电话" prop="responsiblePersonTel">
+                <el-input v-model.trim="toiletForm.responsiblePersonTel" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="建设单位" prop="owner">
+                <el-input v-model.trim="toiletForm.owner" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="建设时间" prop="ts">
+                <el-date-picker
+                  v-model.trim="toiletForm.ts"
+                  :disabled="isDetailMode"
+                  type="date"
+                  value-format="yyyy-MM-dd
+"
+                  placeholder="选择建设时间"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="24">
+              <el-form-item label="备注" prop="notes">
+                <el-input v-model.trim="toiletForm.notes" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!--右边照片-->
+        <div class="form-right">
+          <el-row>
+            <div class="avatar">
+              <el-image
+                :src="photo!==''?photo:defaultPhoto"
+                fit="cover"
+                style="width: 130px; height: 175px"/>
+            </div>
+          </el-row>
+          <el-row>
+            <el-upload
+              v-show="!isDetailMode"
+              ref="upload"
+              :before-upload="handleBeforeUpload"
+              :on-success="handleSuccess"
+              :http-request="uploadFile"
+              :show-file-list="false"
+              class="avatar-uploader"
+              action="string"
+              accept=".jpg,.jpeg,.png">
+              <el-button type="primary">点击上传照片</el-button>
+            </el-upload>
+            <el-button v-show="!isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('edit')">地图选点</el-button>
+            <el-button v-show="isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('readonly')">查看地图</el-button>
+          </el-row>
+        </div>
+      </div>
+
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+
+    <choose-point-dialog ref="choosepoint" @choose="chooseOver"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+import { Uploadimg } from '@/api/common'
+import ChoosePointDialog from '../mapViews/choosePointDialog'
+
+export default {
+  name: 'EditToilet',
+  components: { ChoosePointDialog },
+  data() {
+    return {
+      baseUrl: this.baseConfig.baseUrl + '/static/',
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      toiletForm: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      sexList: [
+        { name: '男', value: '0' },
+        { name: '女', value: '1' }
+      ], // 性别列表
+      typeList: [],
+      rules: {
+        code: [{ required: true, message: '编号不能为空', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, message: '位置不能为空', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false, // 详情模式
+      canEdit: true
+    }
+  },
+  created() {
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param dialogStatus 对话框类型
+     * @param dialogFormVisible 对话框是否可见
+     * @param row 内容参数（编辑和详情需要）
+     */
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.toiletForm = {
+          id: row.id, // id
+          code: row.code, // 编号
+          name: row.name, // 名称
+          position: row.position, // 位置：社区/道路
+          lng: row.lng, // 经度
+          lat: row.lat, // 纬度
+          owner: row.owner, // 建设单位
+          area: row.area, // 占地面积
+          responsiblePerson: row.responsiblePerson, // 责任人
+          responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
+          notes: row.notes // 备注
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.toiletForm = {
+          id: row.id, // id
+          code: row.code, // 编号
+          name: row.name, // 名称
+          position: row.position, // 位置：社区/道路
+          lng: row.lng, // 经度
+          lat: row.lat, // 纬度
+          owner: row.owner, // 建设单位
+          area: row.area, // 占地面积
+          responsiblePerson: row.responsiblePerson, // 责任人
+          responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          photo: row.photo, // 照片
+          ts: row.ts, // 启用时间
+          notes: row.notes // 备注
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+      if (this.toiletForm.photo && this.toiletForm.photo !== '') {
+        this.photo = this.baseUrl + this.toiletForm.photo
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.toiletForm = {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '', // 备注
+        photo: ''
+      }
+      this.photo = ''
+    },
+    // 保存数据
+    saveData: function() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        if (this.photo.startsWith('http')) { // 上传的普通图片
+          let index = this.photo.indexOf('/static/')
+          if (index !== -1) {
+            index += 8
+          }
+          this.toiletForm.photo = this.photo.substring(index)
+        }
+      }
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.canEdit = false
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.toiletForm)
+        if (valid) {
+          addToilet(this.toiletForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                  this.canEdit = true
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+                this.canEdit = true
+              })
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
+        } else {
+          this.canEdit = true
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.canEdit = false
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateToilet(this.toiletForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+              this.canEdit = true
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
+        } else {
+          this.canEdit = true
+        }
+      })
+    },
+    // 图片上传
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.photo = this.baseUrl + res.data
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      if (response.code === 200) {
+        this.photo = this.baseUrl + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    // 打开地图选点
+    choosePoint(type) {
+      let position = null
+      if (this.toiletForm.lng && this.toiletForm.lat) {
+        position = { lng: this.toiletForm.lng, lat: this.toiletForm.lat }
+      }
+      this.$refs.choosepoint.initDialog(type, position)
+    },
+    // 地图选点完毕
+    chooseOver(marker) {
+      this.$set(this.toiletForm, 'lng', marker.lng)
+      this.$set(this.toiletForm, 'lat', marker.lat)
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
new file mode 100644
index 0000000..92997a0
--- /dev/null
+++ b/src/views/toiletManage/toiletList.vue
@@ -0,0 +1,286 @@
+<!--公厕列表-->
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" search-more-type="default" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="编号/名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.position" size="small" placeholder="社区/道路" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.owner" 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">
+      <template slot="btns">
+        <el-button v-if="hasPerm('/sanitation/toilet/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <!--<el-button size="small" class="edit_btn">删除</el-button>-->
+        <el-upload
+          v-if="hasPerm('/sanitation/toilet/import')"
+          :limit="1"
+          :show-file-list="false"
+          :http-request="uploadFile"
+          :file-list="fileList"
+          action="string"
+          accept=".xls,.xlsx"
+          class="edit_btn">
+          <el-button slot="trigger" size="small">批量导入</el-button>
+        </el-upload>
+        <el-button v-if="hasPerm('/sanitation/toilet/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
+            <el-button v-if="hasPerm('/sanitation/toilet/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/toilet/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-toilet v-show="editShow" ref="edittoilet" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<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 },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        owner: '', // 建设单位
+        position: '', // 位置
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: 'desc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '位置',
+          value: 'position',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'responsiblePerson',
+          align: 'center',
+          width: 80
+        },
+        {
+          text: '责任人电话',
+          value: 'responsiblePersonTel',
+          align: 'center'
+        },
+        {
+          text: '建设单位',
+          value: 'owner',
+          align: 'center'
+        },
+        {
+          text: '建设时间',
+          value: 'ts',
+          align: 'center'
+        },
+        {
+          text: '占地面积',
+          value: 'area',
+          align: 'center'
+        }
+      ], // 显示列
+      timeRange: [], // 时间范围
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [],
+      fileList: [],
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      editShow: false // 编辑页面是否显示
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      const that = this
+      getToiletListPage(this.listQuery).then(response => {
+        that.list = response.data.rows
+        that.total = response.data.total
+        that.listLoading = false
+      })
+    },
+    // 点击编辑
+    edit(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('update', true, row)
+    },
+    // 点击详情
+    goDetail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    // 点击新增
+    add() {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('create', true)
+    },
+    // 删除单个公厕
+    del(row) {
+      const deleteIds = [row.id]
+      this.$confirm(
+        '确定要删除该公厕吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delToilet(deleteIds).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    // 删除多个公厕
+    batchDel() {
+      if (this.checkSelection()) {
+        const deleteIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          deleteIds.push(value.id)
+        })
+        this.$confirm(
+          '确定要删除所选公厕吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delToilet(deleteIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportToilet(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportToilet(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const fileName = `公厕列表.xlsx`
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    // 重置后的操作， 若不需要显示重置按钮则不需要写
+    clearInput() {
+      this.listQuery = {
+        keywords: '', // 关键字
+        owner: '', // 建设单位
+        position: '', // 位置
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: 'desc'
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>

diff --git a/package.json b/package.json
index f8c5e2a..9f3a3eb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.2.1",
     "element-ui": "2.13.0",
     "event-source-polyfill": "^1.0.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
@@ -34,7 +35,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
     "vue2-leaflet": "^2.7.0",
-    "vuex": "3.0.1"
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..2ca7549
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,13 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..10fd245
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,97 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+// 公厕查询
+export function getToiletListPage(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+// 公厕查询
+export function getToiletList(pid) {
+  return request({
+    url: '/sanitation/toilet/list',
+    method: 'get',
+    params: {
+      pid: pid
+    }
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 批量导入
+export function batchImportToilet(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: '/sanitation/toilet/import',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+// 批量导出
+export function batchExportToilet(params, config) {
+  return request({
+    url: '/sanitation/toilet/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
deleted file mode 100644
index 8f38b8f..0000000
--- a/src/api/system/toilet.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 公厕管理接口
- */
-import request from '@/utils/request'
-import qs from 'qs'
-export function getToiletList(params) {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
-  })
-}
-
-export function getDetail(id) {
-  return request({
-    url: '/sanitation/toiletClean/detail',
-    method: 'get',
-    params: {
-      id: id
-    }
-  })
-}
-
-// 公厕查询
-export function getToiletAll() {
-  return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get'
-  })
-}
-
-// 添加公厕
-export function addToilet(params) {
-  return request({
-    url: '/sanitation/toilet/add',
-    method: 'post',
-    params
-  })
-}
-// 修改公厕机构
-export function updateToilet(params) {
-  return request({
-    url: '/sanitation/toilet/update',
-    method: 'post',
-    params
-  })
-}
-// 删除公厕机构
-export function delToilet(ids) {
-  return request({
-    url: '/sanitation/toilet/delete',
-    method: 'post',
-    params: {
-      ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
-  })
-}
-// 批量导出
-export function exportRecords(params) {
-  return request({
-    url: 'device/batchExport',
-    method: 'get',
-    timeout: 120000,
-    params,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
-
-// 公厕保洁记录查询
-export function getToiletJobRecords(params) {
-  return request({
-    url: '/sanitation/toilet/jobRecord',
-    method: 'get',
-    params
-  })
-}
-
-// 批量导出
-export function batchExportToiletJobRecords(params, config) {
-  return request({
-    url: '/sanitation/toilet/exportJobRecord',
-    method: 'get',
-    timeout: 120000,
-    params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
-  })
-}
diff --git a/src/assets/global_images/toilet.png b/src/assets/global_images/toilet.png
new file mode 100644
index 0000000..6d9fc05
--- /dev/null
+++ b/src/assets/global_images/toilet.png
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5077bef..04d322d 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -154,6 +154,10 @@
       type: String,
       default: ''
     }, // 表格大小，默认，small,mini等，与el-table条件仙童
+    pagination: {
+      type: Boolean,
+      default: true
+    },
     toolsOption: {
       type: Object,
       default: function() {
diff --git a/src/components/SearchArea/SearchArea.vue b/src/components/SearchArea/SearchArea.vue
index 1175911..de9ba54 100644
--- a/src/components/SearchArea/SearchArea.vue
+++ b/src/components/SearchArea/SearchArea.vue
@@ -53,7 +53,7 @@
     }, // 高级检索的样式，default页面内，dialog弹窗
     size: {
       type: String,
-      default: ''
+      default: 'small'
     }// 按钮及输入框大小
   },
   data() {
diff --git a/src/components/mapWindow/base/mixins/abstract.js b/src/components/mapWindow/base/mixins/abstract.js
new file mode 100644
index 0000000..9cf6d52
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/abstract.js
@@ -0,0 +1,13 @@
+class Mixin {
+  constructor({ component, props, events, extraProps, exceptProps }) {
+    this.render = function(h) {
+      return h(component, {
+        props: props.reduce((obj, key) => Object.assign(obj, { [key]: this[key] }), {}),
+        on: events.reduce((obj, key) => Object.assign(obj, { [key]: this.transmitEvent }), {})
+      })
+    }
+    this.props = [...extraProps, ...props.filter(prop => exceptProps.indexOf(prop))]
+  }
+}
+
+export default prop => new Mixin(prop)
diff --git a/src/components/mapWindow/base/mixins/common.js b/src/components/mapWindow/base/mixins/common.js
new file mode 100644
index 0000000..2fd1a28
--- /dev/null
+++ b/src/components/mapWindow/base/mixins/common.js
@@ -0,0 +1,82 @@
+const types = {
+  map: {
+    unload: 'clearMap'
+  },
+  control: {
+    unload: 'removeControl'
+  },
+  layer: {
+    unload: 'removeLayer'
+  },
+  features: {
+    unload: 'removeFeatures'
+  },
+  listener: {
+    unload: 'removeListener'
+  }
+}
+
+const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
+
+function destroyInstance () {
+  const { unload, renderByParent, $parent } = this
+  if (renderByParent) {
+    $parent.reload()
+  }
+  unload()
+}
+
+class Mixin {
+  constructor (prop) {
+    this.methods = {
+      ready () {
+        const $parent = getParent(this.$parent)
+        const map = this.map = $parent.map
+        this.load()
+        this.$emit('ready', {
+          map
+        })
+      },
+      transmitEvent (e) {
+        this.$emit(e.type.replace(/^on/, ''), e)
+      },
+      reload () {
+        this && this.$nextTick(() => {
+          this.unload()
+          this.$nextTick(this.load)
+        })
+      },
+      unload () {
+        const { map, originInstance } = this
+        try {
+          switch (prop.type) {
+            case 'search':
+              return originInstance.clearResults()
+            case 'autoComplete':
+            case 'lushu':
+              return originInstance.dispose()
+            case 'markerClusterer':
+              return originInstance.clearMarkers()
+            default:
+              map[types[prop.type].unload](originInstance)
+          }
+        } catch (e) {}
+      }
+    }
+    this.computed = {
+      renderByParent () {
+        return this.$parent.preventChildrenRender
+      }
+    }
+    this.mounted = function () {
+      console.log('common mounted')
+      const $parent = getParent(this.$parent)
+      const map = $parent.map
+      const { ready } = this
+      console.log(map)
+      map ? ready() : $parent.$on('onload', ready)
+    }
+  }
+}
+
+export default type => new Mixin({ type })
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
new file mode 100644
index 0000000..931a5e9
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,132 @@
+<template>
+  <div id="map" ref="mapDiv" class="baseMap">
+    <slot/>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'LeafletMap',
+  data() {
+    return {
+      map: null,
+      baseLayer: [],
+      markers: [], // 选点
+      pois: [], // 兴趣点结果
+      layers: {
+        bjPoint: '', // 部件点图层
+        grid: '', // 单元网格图层
+        shopPoint: '' // 商铺图层
+      },
+      form: {
+        longitude: '', // 定位点经度
+        latitude: '', // 定位点纬度
+        communityId: '', // 社区ID
+        communityName: '', // 社区名称
+        gridId: '', // 单元网格ID
+        componentId: '', // 部件ID
+        componentName: '' // 部件名称
+      }, // 主页面返回值
+      showpoi: true,
+      keywords: '', // 查询关键字
+      limit: 100, // 兴趣点查询的最大结果数
+      showEventPointPopup: true, // 是否显示事部件的popup
+      queryEventSwitch: '1', // 1==查询事件；0==查询部件
+      compListOpts: [] // 部件选择下拉框option
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseUrl',
+      'partsUrl',
+      'mapUrl',
+      'gridUrl',
+      'partsAllUrl'
+    ])
+  },
+  mounted() {
+    this.initMap()
+  },
+  methods: {
+    initMap() {
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: 14,
+        maxZoom: 25,
+        center: this.baseConfig.center,
+        zoom: this.baseConfig.zoom,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.$emit('onload', map)
+      // 加载图层
+      this.addLayers()
+    },
+    addLayers() {
+      // 加载天地图底图和标注
+      const tdtMap = L.tileLayer(this.baseConfig.mapUrl, {
+        maxZoom: 18
+      })
+      const tdtLabel = L.tileLayer(this.baseConfig.labelUrl,
+        { maxZoom: 18 })
+      // const satellite = L.tileLayer(this.baseConfig.satelliteUrl, {
+      //   maxZoom: 22
+      // })
+      this.baseLayer.push(tdtMap.addTo(this.map))
+      // this.baseLayer.push(satellite.addTo(this.map))
+      this.baseLayer.push(tdtLabel.addTo(this.map))
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .baseMap {
+    height: 100%;
+    width: 100%;
+    /*border: 1px solid #DCDCDC;*/
+    /*border-radius: 4px;*/
+  }
+</style>
+
+<style>
+  .leaflet-container a.leaflet-popup-close-button {
+    top: 5px; /* 修改弹窗关闭按钮样式 */
+    right: 10px; /* 修改弹窗关闭按钮样式 */
+  }
+
+  .leaflet-popup-content .popup-div {
+    font-size: 15px;
+    padding: 6px;
+  }
+
+  .leaflet-popup-content .popup-title {
+    font-weight: bold;
+  }
+
+  .leaflet-popup-content .dashed-line {
+    border-bottom: 1px dashed #dddddd;
+    margin: 10px -10px;
+  }
+
+  .leaflet-popup-content .popup-item {
+    padding-bottom: 6px;
+  }
+
+  .leaflet-popup-content .popup-item label {
+    font-weight: bold;
+    padding-right: 15px;
+  }
+
+  .leaflet-popup-content .popup-subitem {
+    padding-bottom: 6px;
+    font-size: 12px;
+  }
+</style>
diff --git a/src/components/mapWindow/mapWindow.vue b/src/components/mapWindow/mapWindow.vue
new file mode 100644
index 0000000..9ced291
--- /dev/null
+++ b/src/components/mapWindow/mapWindow.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Description: 顶部菜单项
+ * @Author: 王晓颖
+ * @Date:2020-08-08
+ -->
+<template>
+  <div class="window_view">
+    <span class="view-text" :style="{'font-size':size+'rem'}"><slot/></span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MapWindow',
+  props: {
+    size: {
+      type: String,
+      default: '0.09'
+    }
+  },
+  data () {
+    return {
+      selected: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import '../../assets/css/variable.scss';
+  .window_view{
+    padding: .08rem .14rem;
+    background-size: 100% 100%;
+    margin-right: .05rem;
+    text-align: center;
+    background: url("../../assets/images/button/button_yellow.png") no-repeat;
+    color: #fccd14;
+    animation: bounce 2.5s 1 0s both; // keyframe bounce,持续2.5s,播放2次
+    transform-origin: center bottom;
+  }
+  .view-text{
+    font-weight: bolder;
+  }
+</style>
diff --git a/src/permission.js b/src/permission.js
index dc6b2f8..809ca86 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,8 +25,8 @@
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
           // 设置当前子系统为基础资源子系统
           const currentSys = {
-            code: 'baseResourse',
-            name: '基础资源子系统'
+            code: 'toliet',
+            name: '公共厕所管理系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
diff --git a/src/router/index.js b/src/router/index.js
index 431844b..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@
     ]
   },
   // 登录页面
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/login', component: () => import('@/views/login/index_2'), hidden: true },
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
index 442aa6f..fb9cbea 100644
--- a/src/router/modules/statistics.js
+++ b/src/router/modules/statistics.js
@@ -5,7 +5,7 @@
   {
     path: 'statisticsToilet',
     component: Layout,
-    redirect: '/statisticsToilet',
+    redirect: '/workStatistics',
     name: 'StatisticsToilet',
     meta: {
       title: '作业统计',
@@ -14,10 +14,16 @@
     },
     children: [
       {
-        path: '/statistics',
-        name: 'Statistics',
-        component: () => import('@/views/statistics/workStatistics'),
-        meta: { title: '作业统计', icon: 'function', permission: ['/statisticsToilet'] }
+        path: '/workStatistics',
+        name: 'WorkStatistics',
+        component: () => import('@/views/statistics/toiletAssessment'),
+        meta: { title: '作业统计', icon: '', permission: ['/toilet/workStatistics'] }
+      },
+      {
+        path: '/evaluationStatistics',
+        name: 'EvaluationStatistics',
+        component: () => import('@/views/statistics/evaluationAssessment'),
+        meta: { title: '评价统计', icon: '', permission: ['/toilet/evaluationStatistics'] }
       }
     ]
   }
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
index e537ce9..b221a0e 100644
--- a/src/router/modules/toilet.js
+++ b/src/router/modules/toilet.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletList',
         name: 'ToiletList',
-        component: () => import('@/views/toilet/listToilet'),
+        component: () => import('@/views/toiletManage/toiletList'),
         meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
       },
       {
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
index 3725050..5e0759f 100644
--- a/src/router/modules/work.js
+++ b/src/router/modules/work.js
@@ -16,7 +16,7 @@
       {
         path: '/toiletWork',
         name: 'ToiletWork',
-        component: () => import('@/views/toilet/listWork'),
+        component: () => import('@/views/toiletClean/toiletCleanList'),
         meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
       }
     ]
diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a0cb8cf..3ab50d5 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -120,17 +120,23 @@
       })
     },
     // 获取用户权限
-    GetMenus({ commit, state }) {
-      console.log('in store.permission.js:GetMenus:')
+    GetMenus({ commit, state }, currentSystem) {
+      // console.log('in store.permission.js:GetMenus:')
+      console.log('获取' + currentSystem.name + '的菜单')
+      const params = {
+        parentCode: currentSystem.code // 传入该子系统的code，获取子系统的权限
+      }
       return new Promise((resolve, reject) => {
-        getMenus(state.token).then(response => { // 处理返回值
+        // 此处获取用户所有权限
+        getMenus(params).then(response => { // 处理返回值
           const data = response.data
           const menus = [] // 仅菜单
           const btns = [] // 非菜单
           if (data.menus && data.menus.length > 0) {
-            commit('SET_MENUS', data.menus)
-            for (const menu of data.menus) { // 遍历菜单，获取所有的权限项
-              if (menu.ismenu === '1') { // 将是菜单的放入menus
+            const allmenus = [...data.menus]
+            commit('SET_MENUS', allmenus)
+            for (const menu of allmenus) { // 遍历菜单，获取所有的权限项
+              if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus
                 const menu_tmp = {}
                 menu_tmp.url = menu.url
                 menu_tmp.icon = menu.icon
@@ -142,11 +148,11 @@
               btn_tmp.name = menu.name
               btn_tmp.icon = menu.icon
               btns.push(btn_tmp)
-              // console.log(menu.url)
             }
           }
           // 过滤路由表
-          const accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          let accessedRouters = filterAsyncRouter(asyncRouterMap, menus)
+          // accessedRouters = filterRedirect(accessedRouters)
           commit('SET_BTNS', btns)
           commit('SET_ROUTERS', accessedRouters)
           resolve(response)
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..5cd16af 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -15,15 +15,15 @@
   return ct_month
 }
 
-export function getLastWeek() { // 默认显示上周
+export function getLastWeek(fmt) { // 默认显示上周
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 7)
-  return ct_month
+  return ct_month.Format(fmt)
 }
-export function getLastMonth() { // 默认显示上个月
+export function getLastMonth(fmt) { // 默认显示上个月
   const ct_month = new Date()
   ct_month.setTime(ct_month.getTime() - 3600 * 1000 * 24 * 30)
-  return ct_month
+  return ct_month.Format(fmt)
 }
 
 // 对Date的扩展，将 Date 转化为指定格式的String
diff --git a/src/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/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index feba3f6..a18db88 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -41,10 +41,7 @@
           zoomOffset: 1
         }
       },
-      // mapurl: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
       mapurl: this.baseConfig.mapUrl,
-      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
       labelurl: this.baseConfig.labelUrl
     }
   },
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index b356b46..9525867 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -1,30 +1,11 @@
 <template>
   <div>
     <div v-loading="loading" class="overview-map-container">
-      <div id="map"/>
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
     </div>
-    <!--<el-amap-info-window-->
-    <!--v-if="bridgeInfo"-->
-    <!--:position="currentWindow.position"-->
-    <!--:visible="currentWindow.visible"-->
-    <!--class="info-Window">-->
-    <!--<div v-if="currentWindow.windowType=='info'?true:false" class="info-window">-->
-    <!--<div class="info-header">{{ bridgeInfo.devcode }} <span :style="{'font-size':'14px', 'color':bridgeInfo.onlineState=='0'?'red':'green'}">({{ bridgeInfo.onlineState=='0'?'离线':'在线' }})</span></div>-->
-    <!--<div class="info-body">-->
-    <!--<div>设备类型：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备型号：{{ bridgeInfo.name }}</div>-->
-    <!--<div>设备厂商：{{ bridgeInfo.name }}</div>-->
-    <!--<div>井编号：{{ bridgeInfo.name }}</div>-->
-    <!--<div v-if="bridgeInfo.deep!=0.0">井深：{{ bridgeInfo.name }}m</div>-->
-    <!--<div>权属单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>使用单位：{{ bridgeInfo.name }}</div>-->
-    <!--<div>详细地址：{{ bridgeInfo.name }}</div>-->
-    <!--&lt;!&ndash; 实时数据 &ndash;&gt;-->
-    <!--<el-divider v-if="bridgeInfo.name.length>0"/>-->
-    <!--&lt;!&ndash;<div v-for="realData in bridgeInfo.name" :key="bridgeInfo.name+realData.typeName">{{ realData.typeName }}: {{ realData.value }}</div>&ndash;&gt;-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</el-amap-info-window>-->
   </div>
 </template>
 
@@ -32,13 +13,11 @@
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
 import { getDetail } from '@/api/system/bridge'
-// import icon from '/static/images/well/0100.png'
-// import { getAllMarker } from '@/api/overview'
-// import { getMarkerInfo } from '@/api/marker'
-// import { lazyAMapApiLoaderInstance } from 'vue-amap'
-
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
 export default {
   name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
   data() {
     return {
       baselayer: [],
@@ -72,13 +51,15 @@
       loading: false,
       icon: 'cross',
       map: null,
-      msg: 'Welcome to Your Vue.js App'
     }
   },
   mounted() {
-    this.initMap()
   },
   methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
     initMap() {
       const map = L.map('map', {
         minZoom: 2,
@@ -150,7 +131,7 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   #map {
     width: 100%;
-    height: calc(100vh);
+    height: calc(100vh - 120px);
   }
 // 查询框
 .map-search-div{
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..1eeb854
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,135 @@
+<!--
+ * @Description: 人员图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template/>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletLayer',
+  mixins: [commonMixin('layer')],
+  props: {
+    show: {
+      type: Boolean,
+      default: true
+    }, // 是否显示
+    iconSize: {
+      type: Array,
+      default: () => {
+        return [32, 32]
+      }
+    }, // 图标大小
+    iconAnchor: {
+      type: Array,
+      default: () => {
+        return [16, 32]
+      }
+    }, // 图标位移
+    popupAnchor: {
+      type: Array,
+      default: () => {
+        return [-0, -32]
+      }
+    }// 弹窗位移
+  },
+  data() {
+    return {
+      toiletList: [], // 在线网格员
+      toiletLayer: null, // 离线网格员图层
+      layerGroup: [], // 图层组
+      imageBaseUrl: this.baseConfig.baseUrl + '/static/', // 图片前缀地址
+      toiletIcon: require('@/assets/global_images/toilet-position.png')
+    }
+  },
+  watch: {
+    show(val) {
+      if (val) {
+        this.initLayer()
+      } else {
+        this.clearLayer()
+      }
+    }
+  },
+  methods: {
+    load() {
+      console.log('load caseLayer')
+      if (this.show) {
+        this.initLayer()
+      }
+    },
+    // 初始化图层
+    initLayer() {
+      const { map } = this
+      this.layerGroup = [] // 先清空LayerGroup
+      // 初始化图层组
+      /* eslint-disable new-cap */
+      this.toiletLayer = new Leaflet.layerGroup().addTo(map)
+      this.layerGroup.push(this.toiletLayer)
+      console.log('init ToiletLayer')
+      this.loadData()
+    },
+    // 清除图层
+    clearLayer() {
+      const { map, layerGroup } = this
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 过滤数据
+    filterData(params) {
+      const { map, layerGroup } = this
+      const toiletCode = params.toiletCode
+      console.log(toiletCode)
+      layerGroup.forEach(item => map.removeLayer(item))
+    },
+    // 加载全部数据
+    loadData() {
+      const { toiletIcon } = this
+      // 获取数据
+      getToiletList().then(res => {
+        if (res.code === 200) {
+          this.toiletList = res.data // 在线人员列表
+          this.addPointOnMap(this.toiletList, this.toiletLayer, toiletIcon)
+        }
+      })
+    },
+    // 将点加到地图上
+    addPointOnMap: function(itemList, staffLayer, iconType) {
+      const { iconSize, iconAnchor, popupAnchor } = this
+      // 图标
+      const icon = Leaflet.icon({
+        iconUrl: iconType,
+        iconSize: iconSize,
+        iconAnchor: iconAnchor,
+        popupAnchor: popupAnchor
+      })
+      itemList.forEach(item => {
+        const popupStr = '<div class="popup-div">' +
+          '<div class="popup-title">' + item.name + '</div>' +
+          '<div class="dashed-line"></div>' +
+          '<div class="popup-item"><label>公厕编号</label>' + item.code + '</div>' +
+          '<div class="popup-item"><label>位置</label>' + item.position + '</div>' +
+          '<div class="popup-item"><label>建设单位</label>' + item.owner + '</div>' +
+          '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
+          '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
+          '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          Leaflet.marker([item.lat, item.lng], { icon: icon }).addTo(staffLayer).bindPopup(popup)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..15a9c2f
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,120 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+export default {
+  name: 'EvaluationListDialog',
+  data() {
+    return {
+      title: '评价记录',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '评价时间 ', value: 'commentTime', align: 'center' },
+        { text: '分值', value: 'score', align: 'center' },
+        { text: '评价内容', value: 'comment', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: false, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(listQuery, toiletName) {
+      this.title = toiletName + '评价记录'
+      this.listQuery = listQuery
+      this.dialogFormVisible = true
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      ]
+      this.total = 4
+      this.listLoading = false
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/statistics/components/workChart.vue b/src/views/statistics/components/workChart.vue
new file mode 100644
index 0000000..a891e0c
--- /dev/null
+++ b/src/views/statistics/components/workChart.vue
@@ -0,0 +1,79 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"
+    :extend="extend"
+    :data-empty="dataEmpty"
+  />
+</template>
+
+<script>
+export default {
+  name: 'WorkChart',
+  props: {
+    rawdata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      chartSettings: {
+        labelMap: {
+          'count': '清洁次数',
+          'name': '时间'
+        }
+      },
+      extend: {
+        series: {
+          label: { show: true, position: 'top' },
+          itemStyle: {
+            normal: {
+              barBorderRadius: [3, 3, 0, 0]
+            }
+          },
+          barMaxWidth: 20
+        }
+      },
+      dataEmpty: false,
+      data: {
+        columns: ['name', 'count'],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    rawdata(val) {
+      this.data.rows = val
+      this.findMax(val)
+    }
+  },
+  methods: {
+    findMax(data) {
+      const maxValue = Math.max.apply(Math, data.map(function(item) { return item.count }))
+      if (maxValue < 10) {
+        this.extend.yAxis = { max: 10 }
+      } else {
+        this.extend.yAxis = { max: maxValue + 1 }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .chart-title{
+    margin: auto;
+    text-align: center;
+    margin-top: 15px;
+    font-size:20px;
+    font-weight:600
+  }
+  .select-right{
+    /*margin-right: 25px;*/
+    margin-top: 15px;
+    /*width: 200px*/
+  }
+</style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
new file mode 100644
index 0000000..2193f0e
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,161 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="searchByMonth">
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <!--<el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>-->
+      </template>
+      <template slot="columns">
+        <el-table-column label="平均评分" align="center">
+          <template slot-scope="scope">
+            <el-rate
+              v-model="scope.row.avgScore"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}">
+            </el-rate>
+          </template>
+        </el-table-column>
+        <el-table-column label="详细记录" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" @click="showDetail(scope.row.toiletId, scope.row.toiletName)">详细记录</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <evaluation-list-dialog ref="evaluationList"/>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '公厕编号 ', value: 'toiletName', align: 'center' },
+        { text: '公厕 ', value: 'toiletName', align: 'center' },
+        // { text: '平均分', value: 'avgScore', align: 'center' },
+        { text: '评价记录数', value: 'recordsCount', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  created() {
+    this.searchByMonth()
+  },
+  methods: {
+    searchByMonth() {
+      this.listLoading = true
+      this.list = [
+        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
+        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
+        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
+        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
+      ]
+      this.listLoading = false
+    },
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 评价记录详情列表
+    showDetail(id,name) {
+      const listQuery = {
+        beginDate: this.listQuery.beginDate,
+        endDate: this.listQuery.endDate,
+        toiletId: id
+      }
+      this.$refs.evaluationList.initDialog(listQuery,name)
+    },
+    // 批量导出
+    batchExport() {
+      const tableName = this.timeRange[0] + '至' + this.timeRange[1] + '公厕评价统计结果.xlsx'
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..2b8522a
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <el-tabs v-model="activeName" type="card" @tab-click="tabClick">
+      <el-tab-pane label="按日统计" name="byDay">
+        <search-area @search="searchByDay">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="timeRange"
+              :clearable="false"
+              :picker-options="pickerOptions"
+              size="small"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+      <el-tab-pane label="按月统计" name="byMonth">
+        <search-area @search="searchByMonth">
+          <search-item>
+            <el-input v-model.trim="listQuery.toiletCode" size="small" placeholder="公厕编号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="year"
+              :clearable="false"
+              size="small"
+              type="year"
+              value-format="yyyy"
+              placeholder="请选择年份"
+            />
+          </search-item>
+        </search-area>
+      </el-tab-pane>
+    </el-tabs>
+    <work-chart :rawdata="list"/>
+    <normal-table
+      id="dataTable"
+      :data="list"
+      :head="tableOption.head"
+      :pagination="false"
+      :query="listQuery"
+      :total="total"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="tableOption.options"
+      :tools-option="tableOption.toolsOption"
+      @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出</el-button>
+      </template>
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
+import { getToiletJobCount } from '@/api/sanitation/statistics'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+import WorkChart from './components/workChart'
+export default {
+  name: 'ToiletAssessment',
+  components: { WorkChart },
+  data() {
+    return {
+      activeName: 'byDay', // 当前激活tab:byDay按日统计或byMonth按月统计
+      year: '2021', // 按月统计面板中的查询年份
+      timeRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      listQuery: {
+        type: '', // 统计方式，day按天，month按月
+        toiletCode: '', // 公厕编号
+        startTime: '', // 开始时间
+        endTime: '' // 结束时间
+      }, // 筛选条件
+      columns: [
+        { text: '时间', value: 'name', align: 'center' },
+        { text: '作业次数', value: 'count', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [], // 人员类别
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '统计结果' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }// 日期快捷选项
+    }
+  },
+  created() {
+    this.searchByDay()
+  },
+  methods: {
+    // 切换面板
+    tabClick(tab, event) {
+      if (tab.name === 'byDay') {
+        this.searchByDay()
+      } else {
+        this.searchByMonth()
+      }
+    },
+    // 按月统计
+    searchByMonth() {
+      const startTime = this.year + '-01-01'
+      const endTime = this.year + '-12-31'
+      this.listQuery.type = 'month'
+      this.listQuery.startTime = startTime
+      this.listQuery.endTime = endTime
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '2月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '3月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '4月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '5月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '6月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '7月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '8月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '9月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '10月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '11月', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '12月', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    // 按日统计
+    searchByDay() {
+      this.listQuery.type = 'day'
+      this.listQuery.startTime = this.timeRange[0]
+      this.listQuery.endTime = this.timeRange[1]
+      this.fetchData()
+      // this.listLoading = true
+      // this.list = [
+      //   { name: '1.1', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.2', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.3', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.4', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.5', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.6', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.7', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.8', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.9', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.10', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.11', count: 15, real: 5, percent: '32.23%' },
+      //   { name: '1.12', count: 15, real: 5, percent: '32.23%' }
+      // ]
+      // this.listLoading = false
+    },
+    fetchData() {
+      this.listLoading = true
+      getToiletJobCount(this.listQuery).then(response => {
+        this.list = response.data
+        this.total = response.data.length
+        this.listLoading = false
+      })
+    },
+    // 批量导出
+    batchExport() {
+      let tableName = '公厕保洁作业统计.xlsx'
+      if (this.listQuery.type === 'day') {
+        tableName = this.timeRange[0] + '至' + this.timeRange[1] + '按日公厕保洁作业统计.xlsx'
+      } else if (this.listQuery.type === 'month') {
+        tableName = this.year + '年按月公厕保洁作业统计.xlsx'
+      }
+      /* generate workbook object from table */
+      var wb = XLSX.utils.table_to_book(document.querySelector('#dataTable'))
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
+      try {
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), tableName)
+      } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
+      return wbout
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
index 7864470..247c03d 100644
--- a/src/views/toilet/components/detail.vue
+++ b/src/views/toilet/components/detail.vue
@@ -115,7 +115,7 @@
   </div>
 </template>
 <script>
-import { getDetail, updateBridge } from '@/api/system/toilet'
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
 import L from 'leaflet'
 
 export default {
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
index 74fec71..000deea 100644
--- a/src/views/toilet/components/editToilet.vue
+++ b/src/views/toilet/components/editToilet.vue
@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import { addToilet, updateToilet } from '@/api/system/toilet'
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
 import { Uploadimg } from '@/api/common'
 import ChoosePointDialog from '../../mapViews/choosePointDialog'
 
diff --git a/src/views/toilet/listToilet.vue b/src/views/toilet/listToilet.vue
index a885000..2c5209e 100644
--- a/src/views/toilet/listToilet.vue
+++ b/src/views/toilet/listToilet.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { getToiletList, delToilet } from '@/api/system/toilet'
+import { getToiletList, delToilet } from '@/api/sanitation/toilet'
 import EditToilet from './components/editToilet'
 
 export default {
diff --git a/src/views/toilet/listWork.vue b/src/views/toilet/listWork.vue
index 32d3409..a8cf3a0 100644
--- a/src/views/toilet/listWork.vue
+++ b/src/views/toilet/listWork.vue
@@ -45,7 +45,7 @@
 import AppContainer from '@/components/layout/AppContainer'
 import SearchArea from '@/components/SearchArea/SearchArea'
 import SearchItem from '@/components/SearchArea/SearchItem'
-import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/system/toilet'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
 export default {
   name: 'ListWork',
   components: { SearchItem, SearchArea, AppContainer, NormalTable },
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
new file mode 100644
index 0000000..1e4af18
--- /dev/null
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -0,0 +1,207 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.tolietKeywords" size="small" placeholder="公厕编号/名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" size="small" placeholder="作业人" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.jobContent" size="small" placeholder="作业内容" clearable/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          size="small"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
+      <template slot="btns">
+        <el-button v-if="hasPerm('/sanitation/job/export/toilet')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+      </template>
+      <!--<template slot="columns">-->
+      <!--<el-table-column label="操作" align="center" width="80">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>&ndash;&gt;-->
+      <!--&lt;!&ndash;<el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>&ndash;&gt;-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!--</template>-->
+    </normal-table>
+  </app-container>
+</template>
+
+<script>
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
+export default {
+  name: 'ToiletCleanList',
+  data() {
+    return {
+      dateRange: [], // 日期范围
+      listQuery: {
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        startTime: '', // 开始日期
+        tolietKeywords: '', // 公厕编号/名称
+        endTime: '', // 结束日期
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: 'desc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '作业人',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '公厕编号',
+          value: 'toiletCode',
+          align: 'center'
+        },
+        {
+          text: '公厕名称',
+          value: 'toiletName',
+          align: 'center'
+        },
+        {
+          text: '公厕位置',
+          value: 'toiletPosition',
+          align: 'center'
+        },
+        {
+          text: '作业内容',
+          value: 'jobContent',
+          align: 'center'
+        },
+        {
+          text: '作业时间',
+          value: 'startTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [],
+      fileList: [],
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      editShow: false // 编辑页面是否显示
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      if (this.dateRange.length > 0) {
+        this.listQuery.startTime = this.dateRange[0]
+        this.listQuery.endTime = this.dateRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
+    },
+    // 点击详情
+    goDetail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportToiletJobRecords(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `公厕保洁记录.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    // 重置后的操作， 若不需要显示重置按钮则不需要写
+    clearInput() {
+      this.listQuery = {
+        name: '', // 作业人
+        jobContent: '', // 作业内容
+        tolietKeywords: '', // 公厕编号/名称
+        startTime: '', // 开始日期
+        endTime: '', // 结束日期
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: 'desc'
+      }
+      this.dateRange = []
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/src/views/toiletManage/editToilet.vue b/src/views/toiletManage/editToilet.vue
new file mode 100644
index 0000000..e797eec
--- /dev/null
+++ b/src/views/toiletManage/editToilet.vue
@@ -0,0 +1,408 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :fullscreen="false" width="60%" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="toiletForm" label-well-code="right" label-width="100px">
+      <div class="form-div">
+        <div class="form-left">
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="编号" prop="code">
+                <el-input v-model.trim="toiletForm.code" :disabled="isDetailMode" type="text" placeholder="必填"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model.trim="toiletForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="占地面积" prop="area">
+                <el-input v-model.trim="toiletForm.area" :disabled="isDetailMode" type="text" placeholder="必填"/>
+                <!--<el-select v-model="toiletForm.type" :disabled="isDetailMode" placeholder="请选择公厕类别">-->
+                <!--<el-option-->
+                <!--v-for="item in typeList"-->
+                <!--:key="item.value"-->
+                <!--:label="item.name"-->
+                <!--:value="item.value"/>-->
+                <!--</el-select>-->
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="位置" prop="position">
+                <el-input v-model.trim="toiletForm.position" :disabled="isDetailMode" type="text" placeholder="社区/道路"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="经度" prop="lng">
+                <el-input v-model.trim="toiletForm.lng" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="纬度" prop="lat">
+                <el-input v-model.trim="toiletForm.lat" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="责任人" prop="responsiblePerson">
+                <el-input v-model.trim="toiletForm.responsiblePerson" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="责任人电话" prop="responsiblePersonTel">
+                <el-input v-model.trim="toiletForm.responsiblePersonTel" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-form-item label="建设单位" prop="owner">
+                <el-input v-model.trim="toiletForm.owner" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="建设时间" prop="ts">
+                <el-date-picker
+                  v-model.trim="toiletForm.ts"
+                  :disabled="isDetailMode"
+                  type="date"
+                  value-format="yyyy-MM-dd
+"
+                  placeholder="选择建设时间"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="24">
+              <el-form-item label="备注" prop="notes">
+                <el-input v-model.trim="toiletForm.notes" :disabled="isDetailMode" type="text" placeholder=""/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <!--右边照片-->
+        <div class="form-right">
+          <el-row>
+            <div class="avatar">
+              <el-image
+                :src="photo!==''?photo:defaultPhoto"
+                fit="cover"
+                style="width: 130px; height: 175px"/>
+            </div>
+          </el-row>
+          <el-row>
+            <el-upload
+              v-show="!isDetailMode"
+              ref="upload"
+              :before-upload="handleBeforeUpload"
+              :on-success="handleSuccess"
+              :http-request="uploadFile"
+              :show-file-list="false"
+              class="avatar-uploader"
+              action="string"
+              accept=".jpg,.jpeg,.png">
+              <el-button type="primary">点击上传照片</el-button>
+            </el-upload>
+            <el-button v-show="!isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('edit')">地图选点</el-button>
+            <el-button v-show="isDetailMode" type="primary" style="width:126px;margin-top:15px;" @click="choosePoint('readonly')">查看地图</el-button>
+          </el-row>
+        </div>
+      </div>
+
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+
+    <choose-point-dialog ref="choosepoint" @choose="chooseOver"/>
+  </el-dialog>
+</template>
+
+<script>
+import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+import { Uploadimg } from '@/api/common'
+import ChoosePointDialog from '../mapViews/choosePointDialog'
+
+export default {
+  name: 'EditToilet',
+  components: { ChoosePointDialog },
+  data() {
+    return {
+      baseUrl: this.baseConfig.baseUrl + '/static/',
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      toiletForm: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      sexList: [
+        { name: '男', value: '0' },
+        { name: '女', value: '1' }
+      ], // 性别列表
+      typeList: [],
+      rules: {
+        code: [{ required: true, message: '编号不能为空', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '名称不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, message: '位置不能为空', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false, // 详情模式
+      canEdit: true
+    }
+  },
+  created() {
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param dialogStatus 对话框类型
+     * @param dialogFormVisible 对话框是否可见
+     * @param row 内容参数（编辑和详情需要）
+     */
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.toiletForm = {
+          id: row.id, // id
+          code: row.code, // 编号
+          name: row.name, // 名称
+          position: row.position, // 位置：社区/道路
+          lng: row.lng, // 经度
+          lat: row.lat, // 纬度
+          owner: row.owner, // 建设单位
+          area: row.area, // 占地面积
+          responsiblePerson: row.responsiblePerson, // 责任人
+          responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          ts: row.ts, // 启用时间
+          photo: row.photo, // 照片
+          notes: row.notes // 备注
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.toiletForm = {
+          id: row.id, // id
+          code: row.code, // 编号
+          name: row.name, // 名称
+          position: row.position, // 位置：社区/道路
+          lng: row.lng, // 经度
+          lat: row.lat, // 纬度
+          owner: row.owner, // 建设单位
+          area: row.area, // 占地面积
+          responsiblePerson: row.responsiblePerson, // 责任人
+          responsiblePersonTel: row.responsiblePersonTel, // 责任人电话
+          photo: row.photo, // 照片
+          ts: row.ts, // 启用时间
+          notes: row.notes // 备注
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+      if (this.toiletForm.photo && this.toiletForm.photo !== '') {
+        this.photo = this.baseUrl + this.toiletForm.photo
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.toiletForm = {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '', // 备注
+        photo: ''
+      }
+      this.photo = ''
+    },
+    // 保存数据
+    saveData: function() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        if (this.photo.startsWith('http')) { // 上传的普通图片
+          let index = this.photo.indexOf('/static/')
+          if (index !== -1) {
+            index += 8
+          }
+          this.toiletForm.photo = this.photo.substring(index)
+        }
+      }
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.canEdit = false
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.toiletForm)
+        if (valid) {
+          addToilet(this.toiletForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                  this.canEdit = true
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+                this.canEdit = true
+              })
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
+        } else {
+          this.canEdit = true
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.canEdit = false
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateToilet(this.toiletForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+              this.canEdit = true
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
+        } else {
+          this.canEdit = true
+        }
+      })
+    },
+    // 图片上传
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.photo = this.baseUrl + res.data
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      if (response.code === 200) {
+        this.photo = this.baseUrl + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    // 打开地图选点
+    choosePoint(type) {
+      let position = null
+      if (this.toiletForm.lng && this.toiletForm.lat) {
+        position = { lng: this.toiletForm.lng, lat: this.toiletForm.lat }
+      }
+      this.$refs.choosepoint.initDialog(type, position)
+    },
+    // 地图选点完毕
+    chooseOver(marker) {
+      this.$set(this.toiletForm, 'lng', marker.lng)
+      this.$set(this.toiletForm, 'lat', marker.lat)
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .form-div{
+    width:100%;
+    height:100%;
+    display:flex;
+    justify-content: space-between;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
new file mode 100644
index 0000000..92997a0
--- /dev/null
+++ b/src/views/toiletManage/toiletList.vue
@@ -0,0 +1,286 @@
+<!--公厕列表-->
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" search-more-type="default" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="编号/名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.position" size="small" placeholder="社区/道路" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.owner" 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">
+      <template slot="btns">
+        <el-button v-if="hasPerm('/sanitation/toilet/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <!--<el-button size="small" class="edit_btn">删除</el-button>-->
+        <el-upload
+          v-if="hasPerm('/sanitation/toilet/import')"
+          :limit="1"
+          :show-file-list="false"
+          :http-request="uploadFile"
+          :file-list="fileList"
+          action="string"
+          accept=".xls,.xlsx"
+          class="edit_btn">
+          <el-button slot="trigger" size="small">批量导入</el-button>
+        </el-upload>
+        <el-button v-if="hasPerm('/sanitation/toilet/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
+            <el-button v-if="hasPerm('/sanitation/toilet/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/sanitation/toilet/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-toilet v-show="editShow" ref="edittoilet" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<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 },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        owner: '', // 建设单位
+        position: '', // 位置
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: 'desc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '位置',
+          value: 'position',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'responsiblePerson',
+          align: 'center',
+          width: 80
+        },
+        {
+          text: '责任人电话',
+          value: 'responsiblePersonTel',
+          align: 'center'
+        },
+        {
+          text: '建设单位',
+          value: 'owner',
+          align: 'center'
+        },
+        {
+          text: '建设时间',
+          value: 'ts',
+          align: 'center'
+        },
+        {
+          text: '占地面积',
+          value: 'area',
+          align: 'center'
+        }
+      ], // 显示列
+      timeRange: [], // 时间范围
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      typeList: [],
+      fileList: [],
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      editShow: false // 编辑页面是否显示
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      const that = this
+      getToiletListPage(this.listQuery).then(response => {
+        that.list = response.data.rows
+        that.total = response.data.total
+        that.listLoading = false
+      })
+    },
+    // 点击编辑
+    edit(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('update', true, row)
+    },
+    // 点击详情
+    goDetail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    // 点击新增
+    add() {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('create', true)
+    },
+    // 删除单个公厕
+    del(row) {
+      const deleteIds = [row.id]
+      this.$confirm(
+        '确定要删除该公厕吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delToilet(deleteIds).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    // 删除多个公厕
+    batchDel() {
+      if (this.checkSelection()) {
+        const deleteIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          deleteIds.push(value.id)
+        })
+        this.$confirm(
+          '确定要删除所选公厕吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delToilet(deleteIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportToilet(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportToilet(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const fileName = `公厕列表.xlsx`
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    // 重置后的操作， 若不需要显示重置按钮则不需要写
+    clearInput() {
+      this.listQuery = {
+        keywords: '', // 关键字
+        owner: '', // 建设单位
+        position: '', // 位置
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: 'desc'
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin-left:5px;
+    }
+  }
+</style>
diff --git a/static/project.config.json b/static/project.config.json
index e4b8dce..643a5ff 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,5 +1,5 @@
 {
-  "title": "基础资源系统",
+  "title": "公共厕所管理系统",
   "baseUrl": "http://111.198.10.15:11409/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,