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

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        component: () => import('@/views/toiletClean/toiletCleanList'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/pieChart.vue b/src/views/statistics/pieChart.vue
new file mode 100644
index 0000000..e4dd287
--- /dev/null
+++ b/src/views/statistics/pieChart.vue
@@ -0,0 +1,58 @@
+<template>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'PieChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    this.extend = {}
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      countByDay(this.listQuery).then(response => {
+        this.data.rows = response.data
+      })
+    }
+  }
+}
+</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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/pieChart.vue b/src/views/statistics/pieChart.vue
new file mode 100644
index 0000000..e4dd287
--- /dev/null
+++ b/src/views/statistics/pieChart.vue
@@ -0,0 +1,58 @@
+<template>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'PieChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    this.extend = {}
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      countByDay(this.listQuery).then(response => {
+        this.data.rows = response.data
+      })
+    }
+  }
+}
+</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/statisticsChart.vue b/src/views/statistics/statisticsChart.vue
new file mode 100644
index 0000000..2c48fe0
--- /dev/null
+++ b/src/views/statistics/statisticsChart.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="chart-container">
+    <div ref="chart" class="chart-body" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+export default {
+  name: 'StatisticsChart',
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  computed: {
+    pieData() {
+      const tmp = []
+      this.list.forEach((item, index) => {
+        const obj = {}
+        obj.name = item.deptName
+        obj.value = item.num
+        tmp.push(obj)
+      })
+      return tmp
+    }
+  },
+  watch: {
+    list() {
+      this.initChart()
+    }
+  },
+  activated() {
+    this.initChart()
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.chart)
+      this.chart.setOption({
+        // tooltip: {
+        //   show: true
+        // }
+        // color: [
+        //   '#19d4ae', '#5ab1ef', '#fa6e86',
+        //   '#ffb980', '#0067a6', '#c4b4e4',
+        //   '#d87a80', '#9cbbff', '#d9d0c7',
+        //   '#87a997', '#d49ea2', '#5b4947',
+        //   '#7ba3a8'
+        // ]
+        // legend: {
+        //   orient: 'vertical',
+        //   right: 0,
+        //   data: this.pieData.map(item => item.name)
+        // }
+        // series: [{
+        //   name: '进出记录',
+        //   type: 'pie',
+        //   data: this.pieData,
+        //   label: {
+        //     show: true
+        //     // formatter: '{b}记录数:{c}条'
+        //   },
+        //   tooltip: {
+        //     // formatter: '{b}<br/>记录数: {d}%,{c}条'
+        //   }
+        // }]
+      })
+      this.chart.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container{
+  text-align: center;
+}
+.chart-body{
+  height: 60vh;
+  width: 80%;
+  margin-right: auto;
+  margin-left: auto;
+}
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/pieChart.vue b/src/views/statistics/pieChart.vue
new file mode 100644
index 0000000..e4dd287
--- /dev/null
+++ b/src/views/statistics/pieChart.vue
@@ -0,0 +1,58 @@
+<template>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'PieChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    this.extend = {}
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      countByDay(this.listQuery).then(response => {
+        this.data.rows = response.data
+      })
+    }
+  }
+}
+</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/statisticsChart.vue b/src/views/statistics/statisticsChart.vue
new file mode 100644
index 0000000..2c48fe0
--- /dev/null
+++ b/src/views/statistics/statisticsChart.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="chart-container">
+    <div ref="chart" class="chart-body" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+export default {
+  name: 'StatisticsChart',
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  computed: {
+    pieData() {
+      const tmp = []
+      this.list.forEach((item, index) => {
+        const obj = {}
+        obj.name = item.deptName
+        obj.value = item.num
+        tmp.push(obj)
+      })
+      return tmp
+    }
+  },
+  watch: {
+    list() {
+      this.initChart()
+    }
+  },
+  activated() {
+    this.initChart()
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.chart)
+      this.chart.setOption({
+        // tooltip: {
+        //   show: true
+        // }
+        // color: [
+        //   '#19d4ae', '#5ab1ef', '#fa6e86',
+        //   '#ffb980', '#0067a6', '#c4b4e4',
+        //   '#d87a80', '#9cbbff', '#d9d0c7',
+        //   '#87a997', '#d49ea2', '#5b4947',
+        //   '#7ba3a8'
+        // ]
+        // legend: {
+        //   orient: 'vertical',
+        //   right: 0,
+        //   data: this.pieData.map(item => item.name)
+        // }
+        // series: [{
+        //   name: '进出记录',
+        //   type: 'pie',
+        //   data: this.pieData,
+        //   label: {
+        //     show: true
+        //     // formatter: '{b}记录数:{c}条'
+        //   },
+        //   tooltip: {
+        //     // formatter: '{b}<br/>记录数: {d}%,{c}条'
+        //   }
+        // }]
+      })
+      this.chart.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container{
+  text-align: center;
+}
+.chart-body{
+  height: 60vh;
+  width: 80%;
+  margin-right: auto;
+  margin-left: auto;
+}
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..67aa32b
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,242 @@
+<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'
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/pieChart.vue b/src/views/statistics/pieChart.vue
new file mode 100644
index 0000000..e4dd287
--- /dev/null
+++ b/src/views/statistics/pieChart.vue
@@ -0,0 +1,58 @@
+<template>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'PieChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    this.extend = {}
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      countByDay(this.listQuery).then(response => {
+        this.data.rows = response.data
+      })
+    }
+  }
+}
+</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/statisticsChart.vue b/src/views/statistics/statisticsChart.vue
new file mode 100644
index 0000000..2c48fe0
--- /dev/null
+++ b/src/views/statistics/statisticsChart.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="chart-container">
+    <div ref="chart" class="chart-body" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+export default {
+  name: 'StatisticsChart',
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  computed: {
+    pieData() {
+      const tmp = []
+      this.list.forEach((item, index) => {
+        const obj = {}
+        obj.name = item.deptName
+        obj.value = item.num
+        tmp.push(obj)
+      })
+      return tmp
+    }
+  },
+  watch: {
+    list() {
+      this.initChart()
+    }
+  },
+  activated() {
+    this.initChart()
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.chart)
+      this.chart.setOption({
+        // tooltip: {
+        //   show: true
+        // }
+        // color: [
+        //   '#19d4ae', '#5ab1ef', '#fa6e86',
+        //   '#ffb980', '#0067a6', '#c4b4e4',
+        //   '#d87a80', '#9cbbff', '#d9d0c7',
+        //   '#87a997', '#d49ea2', '#5b4947',
+        //   '#7ba3a8'
+        // ]
+        // legend: {
+        //   orient: 'vertical',
+        //   right: 0,
+        //   data: this.pieData.map(item => item.name)
+        // }
+        // series: [{
+        //   name: '进出记录',
+        //   type: 'pie',
+        //   data: this.pieData,
+        //   label: {
+        //     show: true
+        //     // formatter: '{b}记录数:{c}条'
+        //   },
+        //   tooltip: {
+        //     // formatter: '{b}<br/>记录数: {d}%,{c}条'
+        //   }
+        // }]
+      })
+      this.chart.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container{
+  text-align: center;
+}
+.chart-body{
+  height: 60vh;
+  width: 80%;
+  margin-right: auto;
+  margin-left: auto;
+}
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..67aa32b
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,242 @@
+<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'
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      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/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..50a07f2
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,191 @@
+<template>
+  <app-container>
+    <!--<div class="statistic-container">-->
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-date-picker
+          v-model="year"
+          type="year"
+          placeholder="请选择统计年份"
+          value-format="yyyy"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="month"
+          type="month"
+          placeholder="请选择统计年月"
+          value-format="yyyy-MM"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData1">
+          <el-option
+            v-for="item in toiletList"
+            :key="item.toiletId"
+            :label="item.name"
+            :value="item.toiletId"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <div class="chart-container">
+      <el-row>
+        <el-col :span="24" class="chart-body" >
+          <div class="chart-body-title">按年/月清洁次数统计</div>
+          <bar-chart ref="chart1"/>
+        </el-col>
+      <!--<el-col :span="12" class="chart-body" >-->
+      <!--<div class="chart-body-select">-->
+      <!--<el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData2">-->
+      <!--<el-option-->
+      <!--v-for="item in toiletList"-->
+      <!--:key="item.toiletId"-->
+      <!--:label="item.name"-->
+      <!--:value="item.toiletId"/>-->
+      <!--</el-select>-->
+      <!--</div>-->
+      <!--<div class="chart-body-title" style="padding-top: 20px">按年/月清洁次数统计</div>-->
+      <!--<bar-chart ref="chart2"/>-->
+      <!--</el-col>-->
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+import { getDayTime } from '@/utils/dateutils'
+import DeptSelect from '@/components/DeptSelect/index'
+import PieChart from './pieChart'
+import BarChart from './barChart'
+
+export default {
+  name: 'WorkStatistics',
+  components: { BarChart, PieChart, DeptSelect },
+  data() {
+    return {
+      year: '',
+      month: '',
+      listQuery: {
+        staticType: 'year',
+        toiletId: '',
+        startTime: '2020-01-01',
+        endTime: '2020-12-30'
+      },
+      toiletList: [{ toiletId: '9461', name: '公厕1' }, { toiletId: '9462', name: '公厕2' }, { toiletId: '9463', name: '公厕3' }], // 显示列
+      list: [], // 列表数据
+      chartList: [],
+      chartList2: [],
+      chartshow: false
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData1()
+    // this.fetchData2()
+  },
+  methods: {
+    // 获取统计数据
+    fetchData1() {
+      this.$refs.chart1.fetchData(this.listQuery)
+    },
+    fetchData2() {
+      this.$refs.chart2.fetchData(this.listQuery)
+    },
+    changeDate(date) {
+      let beginTime, endTime
+
+      if (date === 'today') {
+        beginTime = getDayTime(new Date().getTime())
+        endTime = new Date()
+        this.timeRange = [beginTime, endTime]
+      } else if (date === 'yesterday') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
+        endTime = getDayTime(new Date().getTime())
+      } else if (date === 'sevendays') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+        endTime = new Date()
+      } else if (date === 'lastmonth') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+        endTime = new Date()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      // this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleColor:#fff;
+  .app-container{
+    padding: 5px 10px 10px 10px;
+    .statistic-container{
+      margin: 10px;
+      padding:0px;
+      border: 1px solid #d3dce6;
+      .chart-tools{
+        background-color: #f2f2f2;
+        line-height: 40px;
+        padding-left: 10px;
+        padding-right: 5px;
+        .chart-tool-text{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button:hover{
+          background-color: #8cc5ff;
+          cursor: pointer;
+          color:white
+        }
+        .chart-tool-button:active{
+          background-color: #8cc5ff;
+          color:white
+        }
+        .editor--datetimerange.el-input__inner{
+          width: 300px;
+        }
+      }
+      .chart-title{
+        margin: auto;
+        text-align: center;
+        margin-top: 15px;
+      }
+    }
+    .chart-body{
+      padding:15px;
+      .chart-body-title {
+        font-size:22px;
+        text-align: center;
+        background-color: white;
+        padding-top: 20px;
+      }
+      .chart-body-select{
+        margin-top:20px;
+        text-align: center;
+        .select-label{
+          font-size: 15px;
+          color: #606266;
+          line-height: 40px;
+          font-weight:500;
+          padding: 0 6px 0 0
+        }
+      }
+    }
+  }
+  .chart-container{
+    background-color: $tableTitleColor !important;
+    border-top: 12px solid #ebebeb !important;
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/pieChart.vue b/src/views/statistics/pieChart.vue
new file mode 100644
index 0000000..e4dd287
--- /dev/null
+++ b/src/views/statistics/pieChart.vue
@@ -0,0 +1,58 @@
+<template>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'PieChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    this.extend = {}
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      countByDay(this.listQuery).then(response => {
+        this.data.rows = response.data
+      })
+    }
+  }
+}
+</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/statisticsChart.vue b/src/views/statistics/statisticsChart.vue
new file mode 100644
index 0000000..2c48fe0
--- /dev/null
+++ b/src/views/statistics/statisticsChart.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="chart-container">
+    <div ref="chart" class="chart-body" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+export default {
+  name: 'StatisticsChart',
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  computed: {
+    pieData() {
+      const tmp = []
+      this.list.forEach((item, index) => {
+        const obj = {}
+        obj.name = item.deptName
+        obj.value = item.num
+        tmp.push(obj)
+      })
+      return tmp
+    }
+  },
+  watch: {
+    list() {
+      this.initChart()
+    }
+  },
+  activated() {
+    this.initChart()
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.chart)
+      this.chart.setOption({
+        // tooltip: {
+        //   show: true
+        // }
+        // color: [
+        //   '#19d4ae', '#5ab1ef', '#fa6e86',
+        //   '#ffb980', '#0067a6', '#c4b4e4',
+        //   '#d87a80', '#9cbbff', '#d9d0c7',
+        //   '#87a997', '#d49ea2', '#5b4947',
+        //   '#7ba3a8'
+        // ]
+        // legend: {
+        //   orient: 'vertical',
+        //   right: 0,
+        //   data: this.pieData.map(item => item.name)
+        // }
+        // series: [{
+        //   name: '进出记录',
+        //   type: 'pie',
+        //   data: this.pieData,
+        //   label: {
+        //     show: true
+        //     // formatter: '{b}记录数:{c}条'
+        //   },
+        //   tooltip: {
+        //     // formatter: '{b}<br/>记录数: {d}%,{c}条'
+        //   }
+        // }]
+      })
+      this.chart.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container{
+  text-align: center;
+}
+.chart-body{
+  height: 60vh;
+  width: 80%;
+  margin-right: auto;
+  margin-left: auto;
+}
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..67aa32b
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,242 @@
+<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'
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      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/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..50a07f2
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,191 @@
+<template>
+  <app-container>
+    <!--<div class="statistic-container">-->
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-date-picker
+          v-model="year"
+          type="year"
+          placeholder="请选择统计年份"
+          value-format="yyyy"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="month"
+          type="month"
+          placeholder="请选择统计年月"
+          value-format="yyyy-MM"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData1">
+          <el-option
+            v-for="item in toiletList"
+            :key="item.toiletId"
+            :label="item.name"
+            :value="item.toiletId"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <div class="chart-container">
+      <el-row>
+        <el-col :span="24" class="chart-body" >
+          <div class="chart-body-title">按年/月清洁次数统计</div>
+          <bar-chart ref="chart1"/>
+        </el-col>
+      <!--<el-col :span="12" class="chart-body" >-->
+      <!--<div class="chart-body-select">-->
+      <!--<el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData2">-->
+      <!--<el-option-->
+      <!--v-for="item in toiletList"-->
+      <!--:key="item.toiletId"-->
+      <!--:label="item.name"-->
+      <!--:value="item.toiletId"/>-->
+      <!--</el-select>-->
+      <!--</div>-->
+      <!--<div class="chart-body-title" style="padding-top: 20px">按年/月清洁次数统计</div>-->
+      <!--<bar-chart ref="chart2"/>-->
+      <!--</el-col>-->
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+import { getDayTime } from '@/utils/dateutils'
+import DeptSelect from '@/components/DeptSelect/index'
+import PieChart from './pieChart'
+import BarChart from './barChart'
+
+export default {
+  name: 'WorkStatistics',
+  components: { BarChart, PieChart, DeptSelect },
+  data() {
+    return {
+      year: '',
+      month: '',
+      listQuery: {
+        staticType: 'year',
+        toiletId: '',
+        startTime: '2020-01-01',
+        endTime: '2020-12-30'
+      },
+      toiletList: [{ toiletId: '9461', name: '公厕1' }, { toiletId: '9462', name: '公厕2' }, { toiletId: '9463', name: '公厕3' }], // 显示列
+      list: [], // 列表数据
+      chartList: [],
+      chartList2: [],
+      chartshow: false
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData1()
+    // this.fetchData2()
+  },
+  methods: {
+    // 获取统计数据
+    fetchData1() {
+      this.$refs.chart1.fetchData(this.listQuery)
+    },
+    fetchData2() {
+      this.$refs.chart2.fetchData(this.listQuery)
+    },
+    changeDate(date) {
+      let beginTime, endTime
+
+      if (date === 'today') {
+        beginTime = getDayTime(new Date().getTime())
+        endTime = new Date()
+        this.timeRange = [beginTime, endTime]
+      } else if (date === 'yesterday') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
+        endTime = getDayTime(new Date().getTime())
+      } else if (date === 'sevendays') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+        endTime = new Date()
+      } else if (date === 'lastmonth') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+        endTime = new Date()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      // this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleColor:#fff;
+  .app-container{
+    padding: 5px 10px 10px 10px;
+    .statistic-container{
+      margin: 10px;
+      padding:0px;
+      border: 1px solid #d3dce6;
+      .chart-tools{
+        background-color: #f2f2f2;
+        line-height: 40px;
+        padding-left: 10px;
+        padding-right: 5px;
+        .chart-tool-text{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button:hover{
+          background-color: #8cc5ff;
+          cursor: pointer;
+          color:white
+        }
+        .chart-tool-button:active{
+          background-color: #8cc5ff;
+          color:white
+        }
+        .editor--datetimerange.el-input__inner{
+          width: 300px;
+        }
+      }
+      .chart-title{
+        margin: auto;
+        text-align: center;
+        margin-top: 15px;
+      }
+    }
+    .chart-body{
+      padding:15px;
+      .chart-body-title {
+        font-size:22px;
+        text-align: center;
+        background-color: white;
+        padding-top: 20px;
+      }
+      .chart-body-select{
+        margin-top:20px;
+        text-align: center;
+        .select-label{
+          font-size: 15px;
+          color: #606266;
+          line-height: 40px;
+          font-weight:500;
+          padding: 0 6px 0 0
+        }
+      }
+    }
+  }
+  .chart-container{
+    background-color: $tableTitleColor !important;
+    border-top: 12px solid #ebebeb !important;
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..247c03d
--- /dev/null
+++ b/src/views/toilet/components/detail.vue
@@ -0,0 +1,431 @@
+<template>
+  <div class="info-block">
+    <div class="block-body">
+      <el-row class="body-right">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥梁名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.name }}</span>
+              <!--<div class="item-value-middle"><el-input v-model="bridgeForm.name" :disabled="disabled"/></div>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥型：</span>
+              <span class="item-value-middle">{{ bridgeForm.typeName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.typeName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">柱号：</span>
+              <span class="item-value-middle">{{ bridgeForm.bridgeCode }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">道路名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.roadName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.roadName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">高度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.height }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">长度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.length }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">开建时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.buildTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">通车时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.openTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁图片：</span>
+              <span v-show="photo===''" class="item-value-middle">无</span>
+              <el-image
+                v-if="photo!==''"
+                :src="photo!==''?photo:null"
+                fit="cover"
+                style="width: 430px; height: 275px; margin-top:20px; margin-left: 10px;vertical-align: top;"/>
+              <el-upload
+                ref="upload"
+                :before-upload="handleBeforeUpload"
+                :http-request="uploadPhoto"
+                :show-file-list="false"
+                style="display: inline-block;vertical-align: top;"
+                action="string"
+                accept=".jpg,.jpeg,.png">
+                <el-button v-show="isEditMode" class="edit_btn" type="primary" size="small" style="vertical-align: bottom;" @click="uploadPhoto">上传桥梁图片</el-button>
+              </el-upload>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title">桥梁位置：</span>
+              <span class="item-value-middle">{{ bridgeForm.position }}</span>
+              <el-button class="edit_btn" size="small" @click="checkMap">查看地图</el-button>
+              <div v-if="showMap" style="height: 480px; width: 800px; margin-left: 130px" id="map" keep-alive/>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁简介：</span>
+              <span v-show="!isEditMode" class="item-value-long">{{ bridgeForm.description }}</span>
+              <span v-show="isEditMode" class="item-value-long" ><el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" show-word-limit/></span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row v-show="isEditMode" style="margin-top: 30px;text-align: center">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="cancel">取消</el-button>
+        </el-row>
+      </el-row>
+    </div>
+    <div class="clearfloat"/>
+  </div>
+</template>
+<script>
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
+import L from 'leaflet'
+
+export default {
+  name: 'Detail',
+  data() {
+    return {
+      showMap: false,
+      isEditMode: false,
+      bridgeList: [
+        {id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450},
+        {id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659},
+        {id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659}
+      ],
+      map: null,
+      baselayer: [],
+      icon: 'static/images/well/0100.png',
+      photo: '',
+      bridgeForm: {
+        id: '',
+        name: '',
+        type: '',
+        typeName: '',
+        bridgeCode: '',
+        roadName: '',
+        height: '',
+        length: '',
+        buildTime: '',
+        openTime: '',
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: ''
+      },
+      // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
+      // token: '?token=' + this.$store.getters.token, // token,
+      disabled: true,
+      defaultPhoto: '' // require('../../../assets/global_images/photo.jpg') // 默认图片路径
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    fetchData(bridgeId) {
+      getDetail(bridgeId).then(response => {
+        this.bridgeForm = response.data
+        this.photo = this.bridgeForm.photo
+        this.listLoading = false
+      })
+    },
+    checkMap() {
+      this.initMap()
+      this.initMap()
+    },
+    initMap() {
+      debugger
+      this.showMap = true
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 18,
+        center: [27.763248, 116.043450],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.invalidateSize(true)
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      var Icon = L.icon({
+        iconUrl: require('../../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+      if(this.bridgeForm.name === '永胜桥') {
+        this.map.setView({ lat: 27.763248, lng: 116.043450 }, 16)
+        L.marker([27.763248, 116.043450], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '黄洲桥') {
+        this.map.setView({ lat: 27.760096, lng: 116.053659 }, 16)
+        L.marker([27.760096, 116.053659], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '光明桥') {
+        this.map.setView({ lat: 27.767046, lng: 116.058659 }, 16)
+        L.marker([27.767046, 116.058659], {
+          icon: Icon
+        }).addTo(this.map)
+      }
+    },
+    showUploadBut() {
+      this.isEditMode = true
+    },
+    saveData() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        let index = this.photo.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        this.bridgeForm.photo = this.photo.substring(index)
+      }
+      updateBridge(this.bridgeForm).then(res => {
+        if (res.code === 200) {
+          this.$message.success('编辑成功')
+        }
+      })
+      this.isEditMode = false
+    },
+    // 图片上传
+    uploadPhoto(file) {
+      // console.log('uploadFile:' + file.file.name)
+      // const base_url = process.env.BASE_API + '/static/'
+
+      // 转base64
+      this.getBase64(file.file).then(resBase64 => {
+        this.photo = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
+        console.log(this.photo)
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      console.log(file.size)
+      const isLt2M = file.size / 1024 < 200
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 200KB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      debugger
+      const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        this.photo = base_url + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    getBase64(file) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        let fileResult = ''
+        reader.readAsDataURL(file)
+        // 开始转
+        reader.onload = function() {
+          fileResult = reader.result
+        }
+        // 转 失败
+        reader.onerror = function(error) {
+          reject(error)
+        }
+        // 转 结束  咱就 resolve 出去
+        reader.onloadend = function() {
+          resolve(fileResult)
+        }
+      })
+    },
+    cancel() {
+      this.isEditMode = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $left-width: 160px;
+  .info-block{
+    /*overflow-y: scroll;*/
+    /*white-space: nowrap;*/
+    margin: 10px 20px;
+    padding-bottom: 120px;
+    /*overflow: ;*/
+    .block-title-div{
+      font-size: 17px;
+      color: #1f2d3d;
+      font-weight: bold;
+      /*border-bottom: 1px solid #d3dce6;*/
+      .block-title{
+        padding-left: 10px;
+        margin-bottom: 10px;
+        /*border-left: 5px solid #004493;*/
+      }
+    }
+    .block-body{
+      margin-top: 20px;
+      margin-left: 50px;
+      .body-left{
+        width: $left-width;
+        /*float: left;*/
+      }
+      .body-right{
+        width: calc( 100% - 160px );
+        float: left;
+        .item-div{
+          line-height: 55px;
+          font-size:17px;
+          .item-title{
+            text-align: right;
+            width:120px;
+            color: #909090;
+            font-weight: bold;
+            display: inline-block;
+          }
+          .item-value-middle{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 280px !important;
+            display: inline-block;
+          }
+          .item-value-long{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 680px !important;
+            display: inline-block;
+          }
+        }
+      }
+    }
+    .person-photo{
+      width: 106px;
+      height: 150px;
+      padding: 1px;
+      border: 1px solid #92dfff;
+    }
+
+  }
+  avatar-uploader .el-upload {
+    margin-left: 12px;
+    margin-top: 10px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  // 地图
+  .overview-map-container{
+    width: 100%;
+    padding: 5px;
+    .map-demo{
+      width: 100%;
+      height: calc(100vh - 78px);
+      .svg-icon{
+        width: 20px;
+        height: 20px;
+      }
+      .alarm-icon{
+        width:30px;
+        height: 30px;
+      }
+      .nomal-info-window{
+        background-color: pink;
+      }
+      .info-window{
+        max-width: 250px;
+        /*background-color: lightcyan;*/
+        .info-header{
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          font-weight: bold;
+          /*background-color: #eaf4ff;*/
+        }
+        .info-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+        }
+      }
+      .alarm-window{
+        max-width: 250px;
+        /*background-color: #ffeaf1;*/
+        .alarm-header {
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          color: red;
+          font-weight: bold;
+          /*background-color: #ffecec;*/
+        }
+        .alarm-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+          .alarm-red{
+            color: #ff0000;
+          }
+        }
+      }
+    }
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/pieChart.vue b/src/views/statistics/pieChart.vue
new file mode 100644
index 0000000..e4dd287
--- /dev/null
+++ b/src/views/statistics/pieChart.vue
@@ -0,0 +1,58 @@
+<template>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'PieChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    this.extend = {}
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      countByDay(this.listQuery).then(response => {
+        this.data.rows = response.data
+      })
+    }
+  }
+}
+</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/statisticsChart.vue b/src/views/statistics/statisticsChart.vue
new file mode 100644
index 0000000..2c48fe0
--- /dev/null
+++ b/src/views/statistics/statisticsChart.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="chart-container">
+    <div ref="chart" class="chart-body" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+export default {
+  name: 'StatisticsChart',
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  computed: {
+    pieData() {
+      const tmp = []
+      this.list.forEach((item, index) => {
+        const obj = {}
+        obj.name = item.deptName
+        obj.value = item.num
+        tmp.push(obj)
+      })
+      return tmp
+    }
+  },
+  watch: {
+    list() {
+      this.initChart()
+    }
+  },
+  activated() {
+    this.initChart()
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.chart)
+      this.chart.setOption({
+        // tooltip: {
+        //   show: true
+        // }
+        // color: [
+        //   '#19d4ae', '#5ab1ef', '#fa6e86',
+        //   '#ffb980', '#0067a6', '#c4b4e4',
+        //   '#d87a80', '#9cbbff', '#d9d0c7',
+        //   '#87a997', '#d49ea2', '#5b4947',
+        //   '#7ba3a8'
+        // ]
+        // legend: {
+        //   orient: 'vertical',
+        //   right: 0,
+        //   data: this.pieData.map(item => item.name)
+        // }
+        // series: [{
+        //   name: '进出记录',
+        //   type: 'pie',
+        //   data: this.pieData,
+        //   label: {
+        //     show: true
+        //     // formatter: '{b}记录数:{c}条'
+        //   },
+        //   tooltip: {
+        //     // formatter: '{b}<br/>记录数: {d}%,{c}条'
+        //   }
+        // }]
+      })
+      this.chart.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container{
+  text-align: center;
+}
+.chart-body{
+  height: 60vh;
+  width: 80%;
+  margin-right: auto;
+  margin-left: auto;
+}
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..67aa32b
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,242 @@
+<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'
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      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/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..50a07f2
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,191 @@
+<template>
+  <app-container>
+    <!--<div class="statistic-container">-->
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-date-picker
+          v-model="year"
+          type="year"
+          placeholder="请选择统计年份"
+          value-format="yyyy"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="month"
+          type="month"
+          placeholder="请选择统计年月"
+          value-format="yyyy-MM"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData1">
+          <el-option
+            v-for="item in toiletList"
+            :key="item.toiletId"
+            :label="item.name"
+            :value="item.toiletId"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <div class="chart-container">
+      <el-row>
+        <el-col :span="24" class="chart-body" >
+          <div class="chart-body-title">按年/月清洁次数统计</div>
+          <bar-chart ref="chart1"/>
+        </el-col>
+      <!--<el-col :span="12" class="chart-body" >-->
+      <!--<div class="chart-body-select">-->
+      <!--<el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData2">-->
+      <!--<el-option-->
+      <!--v-for="item in toiletList"-->
+      <!--:key="item.toiletId"-->
+      <!--:label="item.name"-->
+      <!--:value="item.toiletId"/>-->
+      <!--</el-select>-->
+      <!--</div>-->
+      <!--<div class="chart-body-title" style="padding-top: 20px">按年/月清洁次数统计</div>-->
+      <!--<bar-chart ref="chart2"/>-->
+      <!--</el-col>-->
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+import { getDayTime } from '@/utils/dateutils'
+import DeptSelect from '@/components/DeptSelect/index'
+import PieChart from './pieChart'
+import BarChart from './barChart'
+
+export default {
+  name: 'WorkStatistics',
+  components: { BarChart, PieChart, DeptSelect },
+  data() {
+    return {
+      year: '',
+      month: '',
+      listQuery: {
+        staticType: 'year',
+        toiletId: '',
+        startTime: '2020-01-01',
+        endTime: '2020-12-30'
+      },
+      toiletList: [{ toiletId: '9461', name: '公厕1' }, { toiletId: '9462', name: '公厕2' }, { toiletId: '9463', name: '公厕3' }], // 显示列
+      list: [], // 列表数据
+      chartList: [],
+      chartList2: [],
+      chartshow: false
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData1()
+    // this.fetchData2()
+  },
+  methods: {
+    // 获取统计数据
+    fetchData1() {
+      this.$refs.chart1.fetchData(this.listQuery)
+    },
+    fetchData2() {
+      this.$refs.chart2.fetchData(this.listQuery)
+    },
+    changeDate(date) {
+      let beginTime, endTime
+
+      if (date === 'today') {
+        beginTime = getDayTime(new Date().getTime())
+        endTime = new Date()
+        this.timeRange = [beginTime, endTime]
+      } else if (date === 'yesterday') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
+        endTime = getDayTime(new Date().getTime())
+      } else if (date === 'sevendays') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+        endTime = new Date()
+      } else if (date === 'lastmonth') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+        endTime = new Date()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      // this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleColor:#fff;
+  .app-container{
+    padding: 5px 10px 10px 10px;
+    .statistic-container{
+      margin: 10px;
+      padding:0px;
+      border: 1px solid #d3dce6;
+      .chart-tools{
+        background-color: #f2f2f2;
+        line-height: 40px;
+        padding-left: 10px;
+        padding-right: 5px;
+        .chart-tool-text{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button:hover{
+          background-color: #8cc5ff;
+          cursor: pointer;
+          color:white
+        }
+        .chart-tool-button:active{
+          background-color: #8cc5ff;
+          color:white
+        }
+        .editor--datetimerange.el-input__inner{
+          width: 300px;
+        }
+      }
+      .chart-title{
+        margin: auto;
+        text-align: center;
+        margin-top: 15px;
+      }
+    }
+    .chart-body{
+      padding:15px;
+      .chart-body-title {
+        font-size:22px;
+        text-align: center;
+        background-color: white;
+        padding-top: 20px;
+      }
+      .chart-body-select{
+        margin-top:20px;
+        text-align: center;
+        .select-label{
+          font-size: 15px;
+          color: #606266;
+          line-height: 40px;
+          font-weight:500;
+          padding: 0 6px 0 0
+        }
+      }
+    }
+  }
+  .chart-container{
+    background-color: $tableTitleColor !important;
+    border-top: 12px solid #ebebeb !important;
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..247c03d
--- /dev/null
+++ b/src/views/toilet/components/detail.vue
@@ -0,0 +1,431 @@
+<template>
+  <div class="info-block">
+    <div class="block-body">
+      <el-row class="body-right">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥梁名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.name }}</span>
+              <!--<div class="item-value-middle"><el-input v-model="bridgeForm.name" :disabled="disabled"/></div>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥型：</span>
+              <span class="item-value-middle">{{ bridgeForm.typeName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.typeName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">柱号：</span>
+              <span class="item-value-middle">{{ bridgeForm.bridgeCode }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">道路名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.roadName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.roadName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">高度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.height }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">长度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.length }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">开建时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.buildTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">通车时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.openTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁图片：</span>
+              <span v-show="photo===''" class="item-value-middle">无</span>
+              <el-image
+                v-if="photo!==''"
+                :src="photo!==''?photo:null"
+                fit="cover"
+                style="width: 430px; height: 275px; margin-top:20px; margin-left: 10px;vertical-align: top;"/>
+              <el-upload
+                ref="upload"
+                :before-upload="handleBeforeUpload"
+                :http-request="uploadPhoto"
+                :show-file-list="false"
+                style="display: inline-block;vertical-align: top;"
+                action="string"
+                accept=".jpg,.jpeg,.png">
+                <el-button v-show="isEditMode" class="edit_btn" type="primary" size="small" style="vertical-align: bottom;" @click="uploadPhoto">上传桥梁图片</el-button>
+              </el-upload>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title">桥梁位置：</span>
+              <span class="item-value-middle">{{ bridgeForm.position }}</span>
+              <el-button class="edit_btn" size="small" @click="checkMap">查看地图</el-button>
+              <div v-if="showMap" style="height: 480px; width: 800px; margin-left: 130px" id="map" keep-alive/>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁简介：</span>
+              <span v-show="!isEditMode" class="item-value-long">{{ bridgeForm.description }}</span>
+              <span v-show="isEditMode" class="item-value-long" ><el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" show-word-limit/></span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row v-show="isEditMode" style="margin-top: 30px;text-align: center">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="cancel">取消</el-button>
+        </el-row>
+      </el-row>
+    </div>
+    <div class="clearfloat"/>
+  </div>
+</template>
+<script>
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
+import L from 'leaflet'
+
+export default {
+  name: 'Detail',
+  data() {
+    return {
+      showMap: false,
+      isEditMode: false,
+      bridgeList: [
+        {id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450},
+        {id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659},
+        {id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659}
+      ],
+      map: null,
+      baselayer: [],
+      icon: 'static/images/well/0100.png',
+      photo: '',
+      bridgeForm: {
+        id: '',
+        name: '',
+        type: '',
+        typeName: '',
+        bridgeCode: '',
+        roadName: '',
+        height: '',
+        length: '',
+        buildTime: '',
+        openTime: '',
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: ''
+      },
+      // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
+      // token: '?token=' + this.$store.getters.token, // token,
+      disabled: true,
+      defaultPhoto: '' // require('../../../assets/global_images/photo.jpg') // 默认图片路径
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    fetchData(bridgeId) {
+      getDetail(bridgeId).then(response => {
+        this.bridgeForm = response.data
+        this.photo = this.bridgeForm.photo
+        this.listLoading = false
+      })
+    },
+    checkMap() {
+      this.initMap()
+      this.initMap()
+    },
+    initMap() {
+      debugger
+      this.showMap = true
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 18,
+        center: [27.763248, 116.043450],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.invalidateSize(true)
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      var Icon = L.icon({
+        iconUrl: require('../../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+      if(this.bridgeForm.name === '永胜桥') {
+        this.map.setView({ lat: 27.763248, lng: 116.043450 }, 16)
+        L.marker([27.763248, 116.043450], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '黄洲桥') {
+        this.map.setView({ lat: 27.760096, lng: 116.053659 }, 16)
+        L.marker([27.760096, 116.053659], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '光明桥') {
+        this.map.setView({ lat: 27.767046, lng: 116.058659 }, 16)
+        L.marker([27.767046, 116.058659], {
+          icon: Icon
+        }).addTo(this.map)
+      }
+    },
+    showUploadBut() {
+      this.isEditMode = true
+    },
+    saveData() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        let index = this.photo.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        this.bridgeForm.photo = this.photo.substring(index)
+      }
+      updateBridge(this.bridgeForm).then(res => {
+        if (res.code === 200) {
+          this.$message.success('编辑成功')
+        }
+      })
+      this.isEditMode = false
+    },
+    // 图片上传
+    uploadPhoto(file) {
+      // console.log('uploadFile:' + file.file.name)
+      // const base_url = process.env.BASE_API + '/static/'
+
+      // 转base64
+      this.getBase64(file.file).then(resBase64 => {
+        this.photo = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
+        console.log(this.photo)
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      console.log(file.size)
+      const isLt2M = file.size / 1024 < 200
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 200KB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      debugger
+      const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        this.photo = base_url + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    getBase64(file) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        let fileResult = ''
+        reader.readAsDataURL(file)
+        // 开始转
+        reader.onload = function() {
+          fileResult = reader.result
+        }
+        // 转 失败
+        reader.onerror = function(error) {
+          reject(error)
+        }
+        // 转 结束  咱就 resolve 出去
+        reader.onloadend = function() {
+          resolve(fileResult)
+        }
+      })
+    },
+    cancel() {
+      this.isEditMode = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $left-width: 160px;
+  .info-block{
+    /*overflow-y: scroll;*/
+    /*white-space: nowrap;*/
+    margin: 10px 20px;
+    padding-bottom: 120px;
+    /*overflow: ;*/
+    .block-title-div{
+      font-size: 17px;
+      color: #1f2d3d;
+      font-weight: bold;
+      /*border-bottom: 1px solid #d3dce6;*/
+      .block-title{
+        padding-left: 10px;
+        margin-bottom: 10px;
+        /*border-left: 5px solid #004493;*/
+      }
+    }
+    .block-body{
+      margin-top: 20px;
+      margin-left: 50px;
+      .body-left{
+        width: $left-width;
+        /*float: left;*/
+      }
+      .body-right{
+        width: calc( 100% - 160px );
+        float: left;
+        .item-div{
+          line-height: 55px;
+          font-size:17px;
+          .item-title{
+            text-align: right;
+            width:120px;
+            color: #909090;
+            font-weight: bold;
+            display: inline-block;
+          }
+          .item-value-middle{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 280px !important;
+            display: inline-block;
+          }
+          .item-value-long{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 680px !important;
+            display: inline-block;
+          }
+        }
+      }
+    }
+    .person-photo{
+      width: 106px;
+      height: 150px;
+      padding: 1px;
+      border: 1px solid #92dfff;
+    }
+
+  }
+  avatar-uploader .el-upload {
+    margin-left: 12px;
+    margin-top: 10px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  // 地图
+  .overview-map-container{
+    width: 100%;
+    padding: 5px;
+    .map-demo{
+      width: 100%;
+      height: calc(100vh - 78px);
+      .svg-icon{
+        width: 20px;
+        height: 20px;
+      }
+      .alarm-icon{
+        width:30px;
+        height: 30px;
+      }
+      .nomal-info-window{
+        background-color: pink;
+      }
+      .info-window{
+        max-width: 250px;
+        /*background-color: lightcyan;*/
+        .info-header{
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          font-weight: bold;
+          /*background-color: #eaf4ff;*/
+        }
+        .info-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+        }
+      }
+      .alarm-window{
+        max-width: 250px;
+        /*background-color: #ffeaf1;*/
+        .alarm-header {
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          color: red;
+          font-weight: bold;
+          /*background-color: #ffecec;*/
+        }
+        .alarm-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+          .alarm-red{
+            color: #ff0000;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
new file mode 100644
index 0000000..000deea
--- /dev/null
+++ b/src/views/toilet/components/editToilet.vue
@@ -0,0 +1,368 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="toiletForm" label-position="right" label-width="130px">
+      <div class="form-div">
+        <div class="form-left">
+          <el-row :gutter="20">
+            <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="20">
+            <el-col :span="12">
+              <el-form-item label="占地面积" prop="area">
+                <el-input v-model.trim="toiletForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+              </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="20">
+            <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="20">
+            <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="20">
+            <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"
+                  style="width: 100%"
+                  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 slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @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/',
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      photo: '', // 图片路径
+      defaultPhoto: require('../../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      toiletForm: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      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'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        debugger
+        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: '' // 备注
+      }
+      this.photo = ''
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      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()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      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
+            }
+          })
+        }
+      })
+    },
+    // 打开地图选点
+    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)
+    },
+    // 图片上传
+    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)
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/pieChart.vue b/src/views/statistics/pieChart.vue
new file mode 100644
index 0000000..e4dd287
--- /dev/null
+++ b/src/views/statistics/pieChart.vue
@@ -0,0 +1,58 @@
+<template>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'PieChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    this.extend = {}
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      countByDay(this.listQuery).then(response => {
+        this.data.rows = response.data
+      })
+    }
+  }
+}
+</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/statisticsChart.vue b/src/views/statistics/statisticsChart.vue
new file mode 100644
index 0000000..2c48fe0
--- /dev/null
+++ b/src/views/statistics/statisticsChart.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="chart-container">
+    <div ref="chart" class="chart-body" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+export default {
+  name: 'StatisticsChart',
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  computed: {
+    pieData() {
+      const tmp = []
+      this.list.forEach((item, index) => {
+        const obj = {}
+        obj.name = item.deptName
+        obj.value = item.num
+        tmp.push(obj)
+      })
+      return tmp
+    }
+  },
+  watch: {
+    list() {
+      this.initChart()
+    }
+  },
+  activated() {
+    this.initChart()
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.chart)
+      this.chart.setOption({
+        // tooltip: {
+        //   show: true
+        // }
+        // color: [
+        //   '#19d4ae', '#5ab1ef', '#fa6e86',
+        //   '#ffb980', '#0067a6', '#c4b4e4',
+        //   '#d87a80', '#9cbbff', '#d9d0c7',
+        //   '#87a997', '#d49ea2', '#5b4947',
+        //   '#7ba3a8'
+        // ]
+        // legend: {
+        //   orient: 'vertical',
+        //   right: 0,
+        //   data: this.pieData.map(item => item.name)
+        // }
+        // series: [{
+        //   name: '进出记录',
+        //   type: 'pie',
+        //   data: this.pieData,
+        //   label: {
+        //     show: true
+        //     // formatter: '{b}记录数:{c}条'
+        //   },
+        //   tooltip: {
+        //     // formatter: '{b}<br/>记录数: {d}%,{c}条'
+        //   }
+        // }]
+      })
+      this.chart.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container{
+  text-align: center;
+}
+.chart-body{
+  height: 60vh;
+  width: 80%;
+  margin-right: auto;
+  margin-left: auto;
+}
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..67aa32b
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,242 @@
+<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'
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      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/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..50a07f2
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,191 @@
+<template>
+  <app-container>
+    <!--<div class="statistic-container">-->
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-date-picker
+          v-model="year"
+          type="year"
+          placeholder="请选择统计年份"
+          value-format="yyyy"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="month"
+          type="month"
+          placeholder="请选择统计年月"
+          value-format="yyyy-MM"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData1">
+          <el-option
+            v-for="item in toiletList"
+            :key="item.toiletId"
+            :label="item.name"
+            :value="item.toiletId"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <div class="chart-container">
+      <el-row>
+        <el-col :span="24" class="chart-body" >
+          <div class="chart-body-title">按年/月清洁次数统计</div>
+          <bar-chart ref="chart1"/>
+        </el-col>
+      <!--<el-col :span="12" class="chart-body" >-->
+      <!--<div class="chart-body-select">-->
+      <!--<el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData2">-->
+      <!--<el-option-->
+      <!--v-for="item in toiletList"-->
+      <!--:key="item.toiletId"-->
+      <!--:label="item.name"-->
+      <!--:value="item.toiletId"/>-->
+      <!--</el-select>-->
+      <!--</div>-->
+      <!--<div class="chart-body-title" style="padding-top: 20px">按年/月清洁次数统计</div>-->
+      <!--<bar-chart ref="chart2"/>-->
+      <!--</el-col>-->
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+import { getDayTime } from '@/utils/dateutils'
+import DeptSelect from '@/components/DeptSelect/index'
+import PieChart from './pieChart'
+import BarChart from './barChart'
+
+export default {
+  name: 'WorkStatistics',
+  components: { BarChart, PieChart, DeptSelect },
+  data() {
+    return {
+      year: '',
+      month: '',
+      listQuery: {
+        staticType: 'year',
+        toiletId: '',
+        startTime: '2020-01-01',
+        endTime: '2020-12-30'
+      },
+      toiletList: [{ toiletId: '9461', name: '公厕1' }, { toiletId: '9462', name: '公厕2' }, { toiletId: '9463', name: '公厕3' }], // 显示列
+      list: [], // 列表数据
+      chartList: [],
+      chartList2: [],
+      chartshow: false
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData1()
+    // this.fetchData2()
+  },
+  methods: {
+    // 获取统计数据
+    fetchData1() {
+      this.$refs.chart1.fetchData(this.listQuery)
+    },
+    fetchData2() {
+      this.$refs.chart2.fetchData(this.listQuery)
+    },
+    changeDate(date) {
+      let beginTime, endTime
+
+      if (date === 'today') {
+        beginTime = getDayTime(new Date().getTime())
+        endTime = new Date()
+        this.timeRange = [beginTime, endTime]
+      } else if (date === 'yesterday') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
+        endTime = getDayTime(new Date().getTime())
+      } else if (date === 'sevendays') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+        endTime = new Date()
+      } else if (date === 'lastmonth') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+        endTime = new Date()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      // this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleColor:#fff;
+  .app-container{
+    padding: 5px 10px 10px 10px;
+    .statistic-container{
+      margin: 10px;
+      padding:0px;
+      border: 1px solid #d3dce6;
+      .chart-tools{
+        background-color: #f2f2f2;
+        line-height: 40px;
+        padding-left: 10px;
+        padding-right: 5px;
+        .chart-tool-text{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button:hover{
+          background-color: #8cc5ff;
+          cursor: pointer;
+          color:white
+        }
+        .chart-tool-button:active{
+          background-color: #8cc5ff;
+          color:white
+        }
+        .editor--datetimerange.el-input__inner{
+          width: 300px;
+        }
+      }
+      .chart-title{
+        margin: auto;
+        text-align: center;
+        margin-top: 15px;
+      }
+    }
+    .chart-body{
+      padding:15px;
+      .chart-body-title {
+        font-size:22px;
+        text-align: center;
+        background-color: white;
+        padding-top: 20px;
+      }
+      .chart-body-select{
+        margin-top:20px;
+        text-align: center;
+        .select-label{
+          font-size: 15px;
+          color: #606266;
+          line-height: 40px;
+          font-weight:500;
+          padding: 0 6px 0 0
+        }
+      }
+    }
+  }
+  .chart-container{
+    background-color: $tableTitleColor !important;
+    border-top: 12px solid #ebebeb !important;
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..247c03d
--- /dev/null
+++ b/src/views/toilet/components/detail.vue
@@ -0,0 +1,431 @@
+<template>
+  <div class="info-block">
+    <div class="block-body">
+      <el-row class="body-right">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥梁名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.name }}</span>
+              <!--<div class="item-value-middle"><el-input v-model="bridgeForm.name" :disabled="disabled"/></div>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥型：</span>
+              <span class="item-value-middle">{{ bridgeForm.typeName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.typeName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">柱号：</span>
+              <span class="item-value-middle">{{ bridgeForm.bridgeCode }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">道路名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.roadName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.roadName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">高度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.height }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">长度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.length }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">开建时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.buildTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">通车时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.openTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁图片：</span>
+              <span v-show="photo===''" class="item-value-middle">无</span>
+              <el-image
+                v-if="photo!==''"
+                :src="photo!==''?photo:null"
+                fit="cover"
+                style="width: 430px; height: 275px; margin-top:20px; margin-left: 10px;vertical-align: top;"/>
+              <el-upload
+                ref="upload"
+                :before-upload="handleBeforeUpload"
+                :http-request="uploadPhoto"
+                :show-file-list="false"
+                style="display: inline-block;vertical-align: top;"
+                action="string"
+                accept=".jpg,.jpeg,.png">
+                <el-button v-show="isEditMode" class="edit_btn" type="primary" size="small" style="vertical-align: bottom;" @click="uploadPhoto">上传桥梁图片</el-button>
+              </el-upload>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title">桥梁位置：</span>
+              <span class="item-value-middle">{{ bridgeForm.position }}</span>
+              <el-button class="edit_btn" size="small" @click="checkMap">查看地图</el-button>
+              <div v-if="showMap" style="height: 480px; width: 800px; margin-left: 130px" id="map" keep-alive/>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁简介：</span>
+              <span v-show="!isEditMode" class="item-value-long">{{ bridgeForm.description }}</span>
+              <span v-show="isEditMode" class="item-value-long" ><el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" show-word-limit/></span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row v-show="isEditMode" style="margin-top: 30px;text-align: center">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="cancel">取消</el-button>
+        </el-row>
+      </el-row>
+    </div>
+    <div class="clearfloat"/>
+  </div>
+</template>
+<script>
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
+import L from 'leaflet'
+
+export default {
+  name: 'Detail',
+  data() {
+    return {
+      showMap: false,
+      isEditMode: false,
+      bridgeList: [
+        {id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450},
+        {id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659},
+        {id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659}
+      ],
+      map: null,
+      baselayer: [],
+      icon: 'static/images/well/0100.png',
+      photo: '',
+      bridgeForm: {
+        id: '',
+        name: '',
+        type: '',
+        typeName: '',
+        bridgeCode: '',
+        roadName: '',
+        height: '',
+        length: '',
+        buildTime: '',
+        openTime: '',
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: ''
+      },
+      // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
+      // token: '?token=' + this.$store.getters.token, // token,
+      disabled: true,
+      defaultPhoto: '' // require('../../../assets/global_images/photo.jpg') // 默认图片路径
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    fetchData(bridgeId) {
+      getDetail(bridgeId).then(response => {
+        this.bridgeForm = response.data
+        this.photo = this.bridgeForm.photo
+        this.listLoading = false
+      })
+    },
+    checkMap() {
+      this.initMap()
+      this.initMap()
+    },
+    initMap() {
+      debugger
+      this.showMap = true
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 18,
+        center: [27.763248, 116.043450],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.invalidateSize(true)
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      var Icon = L.icon({
+        iconUrl: require('../../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+      if(this.bridgeForm.name === '永胜桥') {
+        this.map.setView({ lat: 27.763248, lng: 116.043450 }, 16)
+        L.marker([27.763248, 116.043450], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '黄洲桥') {
+        this.map.setView({ lat: 27.760096, lng: 116.053659 }, 16)
+        L.marker([27.760096, 116.053659], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '光明桥') {
+        this.map.setView({ lat: 27.767046, lng: 116.058659 }, 16)
+        L.marker([27.767046, 116.058659], {
+          icon: Icon
+        }).addTo(this.map)
+      }
+    },
+    showUploadBut() {
+      this.isEditMode = true
+    },
+    saveData() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        let index = this.photo.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        this.bridgeForm.photo = this.photo.substring(index)
+      }
+      updateBridge(this.bridgeForm).then(res => {
+        if (res.code === 200) {
+          this.$message.success('编辑成功')
+        }
+      })
+      this.isEditMode = false
+    },
+    // 图片上传
+    uploadPhoto(file) {
+      // console.log('uploadFile:' + file.file.name)
+      // const base_url = process.env.BASE_API + '/static/'
+
+      // 转base64
+      this.getBase64(file.file).then(resBase64 => {
+        this.photo = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
+        console.log(this.photo)
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      console.log(file.size)
+      const isLt2M = file.size / 1024 < 200
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 200KB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      debugger
+      const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        this.photo = base_url + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    getBase64(file) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        let fileResult = ''
+        reader.readAsDataURL(file)
+        // 开始转
+        reader.onload = function() {
+          fileResult = reader.result
+        }
+        // 转 失败
+        reader.onerror = function(error) {
+          reject(error)
+        }
+        // 转 结束  咱就 resolve 出去
+        reader.onloadend = function() {
+          resolve(fileResult)
+        }
+      })
+    },
+    cancel() {
+      this.isEditMode = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $left-width: 160px;
+  .info-block{
+    /*overflow-y: scroll;*/
+    /*white-space: nowrap;*/
+    margin: 10px 20px;
+    padding-bottom: 120px;
+    /*overflow: ;*/
+    .block-title-div{
+      font-size: 17px;
+      color: #1f2d3d;
+      font-weight: bold;
+      /*border-bottom: 1px solid #d3dce6;*/
+      .block-title{
+        padding-left: 10px;
+        margin-bottom: 10px;
+        /*border-left: 5px solid #004493;*/
+      }
+    }
+    .block-body{
+      margin-top: 20px;
+      margin-left: 50px;
+      .body-left{
+        width: $left-width;
+        /*float: left;*/
+      }
+      .body-right{
+        width: calc( 100% - 160px );
+        float: left;
+        .item-div{
+          line-height: 55px;
+          font-size:17px;
+          .item-title{
+            text-align: right;
+            width:120px;
+            color: #909090;
+            font-weight: bold;
+            display: inline-block;
+          }
+          .item-value-middle{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 280px !important;
+            display: inline-block;
+          }
+          .item-value-long{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 680px !important;
+            display: inline-block;
+          }
+        }
+      }
+    }
+    .person-photo{
+      width: 106px;
+      height: 150px;
+      padding: 1px;
+      border: 1px solid #92dfff;
+    }
+
+  }
+  avatar-uploader .el-upload {
+    margin-left: 12px;
+    margin-top: 10px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  // 地图
+  .overview-map-container{
+    width: 100%;
+    padding: 5px;
+    .map-demo{
+      width: 100%;
+      height: calc(100vh - 78px);
+      .svg-icon{
+        width: 20px;
+        height: 20px;
+      }
+      .alarm-icon{
+        width:30px;
+        height: 30px;
+      }
+      .nomal-info-window{
+        background-color: pink;
+      }
+      .info-window{
+        max-width: 250px;
+        /*background-color: lightcyan;*/
+        .info-header{
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          font-weight: bold;
+          /*background-color: #eaf4ff;*/
+        }
+        .info-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+        }
+      }
+      .alarm-window{
+        max-width: 250px;
+        /*background-color: #ffeaf1;*/
+        .alarm-header {
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          color: red;
+          font-weight: bold;
+          /*background-color: #ffecec;*/
+        }
+        .alarm-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+          .alarm-red{
+            color: #ff0000;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
new file mode 100644
index 0000000..000deea
--- /dev/null
+++ b/src/views/toilet/components/editToilet.vue
@@ -0,0 +1,368 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="toiletForm" label-position="right" label-width="130px">
+      <div class="form-div">
+        <div class="form-left">
+          <el-row :gutter="20">
+            <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="20">
+            <el-col :span="12">
+              <el-form-item label="占地面积" prop="area">
+                <el-input v-model.trim="toiletForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+              </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="20">
+            <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="20">
+            <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="20">
+            <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"
+                  style="width: 100%"
+                  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 slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @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/',
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      photo: '', // 图片路径
+      defaultPhoto: require('../../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      toiletForm: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      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'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        debugger
+        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: '' // 备注
+      }
+      this.photo = ''
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      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()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      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
+            }
+          })
+        }
+      })
+    },
+    // 打开地图选点
+    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)
+    },
+    // 图片上传
+    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)
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    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/toilet/listToilet.vue b/src/views/toilet/listToilet.vue
new file mode 100644
index 0000000..2c5209e
--- /dev/null
+++ b/src/views/toilet/listToilet.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" 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.owner" size="small" placeholder="建设单位" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.position" size="small" placeholder="位置" clearable/>
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-toilet v-show="editShow" ref="edittoilet" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getToiletList, delToilet } from '@/api/sanitation/toilet'
+import EditToilet from './components/editToilet'
+
+export default {
+  name: 'ListToilet',
+  components: { EditToilet },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字（编号、名称）
+        owner: '', // 建设单位
+        position: '', // 道路
+        offset: 1,
+        limit: 20,
+        sort: 'ts',
+        order: 'desc'
+      }, // 筛选条件
+      timeRange: [],
+      columns: [
+        {
+          text: '公厕编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '公厕名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '建设单位',
+          value: 'owner',
+          align: 'center'
+        },
+        {
+          text: '建设时间',
+          value: 'ts',
+          align: 'center'
+        },
+        {
+          text: '街道',
+          value: 'position',
+          align: 'center'
+        },
+        {
+          text: '占地面积',
+          value: 'area',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'responsiblePerson',
+          align: 'center'
+        },
+        {
+          text: '责任人电话',
+          value: 'responsiblePersonTel',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  mounted() {
+    this.fetchData(false)// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getToiletList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('update', true, row)
+    },
+    // 删除单个公厕
+    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()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '识别记录列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/pieChart.vue b/src/views/statistics/pieChart.vue
new file mode 100644
index 0000000..e4dd287
--- /dev/null
+++ b/src/views/statistics/pieChart.vue
@@ -0,0 +1,58 @@
+<template>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'PieChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    this.extend = {}
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      countByDay(this.listQuery).then(response => {
+        this.data.rows = response.data
+      })
+    }
+  }
+}
+</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/statisticsChart.vue b/src/views/statistics/statisticsChart.vue
new file mode 100644
index 0000000..2c48fe0
--- /dev/null
+++ b/src/views/statistics/statisticsChart.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="chart-container">
+    <div ref="chart" class="chart-body" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+export default {
+  name: 'StatisticsChart',
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  computed: {
+    pieData() {
+      const tmp = []
+      this.list.forEach((item, index) => {
+        const obj = {}
+        obj.name = item.deptName
+        obj.value = item.num
+        tmp.push(obj)
+      })
+      return tmp
+    }
+  },
+  watch: {
+    list() {
+      this.initChart()
+    }
+  },
+  activated() {
+    this.initChart()
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.chart)
+      this.chart.setOption({
+        // tooltip: {
+        //   show: true
+        // }
+        // color: [
+        //   '#19d4ae', '#5ab1ef', '#fa6e86',
+        //   '#ffb980', '#0067a6', '#c4b4e4',
+        //   '#d87a80', '#9cbbff', '#d9d0c7',
+        //   '#87a997', '#d49ea2', '#5b4947',
+        //   '#7ba3a8'
+        // ]
+        // legend: {
+        //   orient: 'vertical',
+        //   right: 0,
+        //   data: this.pieData.map(item => item.name)
+        // }
+        // series: [{
+        //   name: '进出记录',
+        //   type: 'pie',
+        //   data: this.pieData,
+        //   label: {
+        //     show: true
+        //     // formatter: '{b}记录数:{c}条'
+        //   },
+        //   tooltip: {
+        //     // formatter: '{b}<br/>记录数: {d}%,{c}条'
+        //   }
+        // }]
+      })
+      this.chart.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container{
+  text-align: center;
+}
+.chart-body{
+  height: 60vh;
+  width: 80%;
+  margin-right: auto;
+  margin-left: auto;
+}
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..67aa32b
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,242 @@
+<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'
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      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/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..50a07f2
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,191 @@
+<template>
+  <app-container>
+    <!--<div class="statistic-container">-->
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-date-picker
+          v-model="year"
+          type="year"
+          placeholder="请选择统计年份"
+          value-format="yyyy"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="month"
+          type="month"
+          placeholder="请选择统计年月"
+          value-format="yyyy-MM"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData1">
+          <el-option
+            v-for="item in toiletList"
+            :key="item.toiletId"
+            :label="item.name"
+            :value="item.toiletId"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <div class="chart-container">
+      <el-row>
+        <el-col :span="24" class="chart-body" >
+          <div class="chart-body-title">按年/月清洁次数统计</div>
+          <bar-chart ref="chart1"/>
+        </el-col>
+      <!--<el-col :span="12" class="chart-body" >-->
+      <!--<div class="chart-body-select">-->
+      <!--<el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData2">-->
+      <!--<el-option-->
+      <!--v-for="item in toiletList"-->
+      <!--:key="item.toiletId"-->
+      <!--:label="item.name"-->
+      <!--:value="item.toiletId"/>-->
+      <!--</el-select>-->
+      <!--</div>-->
+      <!--<div class="chart-body-title" style="padding-top: 20px">按年/月清洁次数统计</div>-->
+      <!--<bar-chart ref="chart2"/>-->
+      <!--</el-col>-->
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+import { getDayTime } from '@/utils/dateutils'
+import DeptSelect from '@/components/DeptSelect/index'
+import PieChart from './pieChart'
+import BarChart from './barChart'
+
+export default {
+  name: 'WorkStatistics',
+  components: { BarChart, PieChart, DeptSelect },
+  data() {
+    return {
+      year: '',
+      month: '',
+      listQuery: {
+        staticType: 'year',
+        toiletId: '',
+        startTime: '2020-01-01',
+        endTime: '2020-12-30'
+      },
+      toiletList: [{ toiletId: '9461', name: '公厕1' }, { toiletId: '9462', name: '公厕2' }, { toiletId: '9463', name: '公厕3' }], // 显示列
+      list: [], // 列表数据
+      chartList: [],
+      chartList2: [],
+      chartshow: false
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData1()
+    // this.fetchData2()
+  },
+  methods: {
+    // 获取统计数据
+    fetchData1() {
+      this.$refs.chart1.fetchData(this.listQuery)
+    },
+    fetchData2() {
+      this.$refs.chart2.fetchData(this.listQuery)
+    },
+    changeDate(date) {
+      let beginTime, endTime
+
+      if (date === 'today') {
+        beginTime = getDayTime(new Date().getTime())
+        endTime = new Date()
+        this.timeRange = [beginTime, endTime]
+      } else if (date === 'yesterday') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
+        endTime = getDayTime(new Date().getTime())
+      } else if (date === 'sevendays') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+        endTime = new Date()
+      } else if (date === 'lastmonth') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+        endTime = new Date()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      // this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleColor:#fff;
+  .app-container{
+    padding: 5px 10px 10px 10px;
+    .statistic-container{
+      margin: 10px;
+      padding:0px;
+      border: 1px solid #d3dce6;
+      .chart-tools{
+        background-color: #f2f2f2;
+        line-height: 40px;
+        padding-left: 10px;
+        padding-right: 5px;
+        .chart-tool-text{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button:hover{
+          background-color: #8cc5ff;
+          cursor: pointer;
+          color:white
+        }
+        .chart-tool-button:active{
+          background-color: #8cc5ff;
+          color:white
+        }
+        .editor--datetimerange.el-input__inner{
+          width: 300px;
+        }
+      }
+      .chart-title{
+        margin: auto;
+        text-align: center;
+        margin-top: 15px;
+      }
+    }
+    .chart-body{
+      padding:15px;
+      .chart-body-title {
+        font-size:22px;
+        text-align: center;
+        background-color: white;
+        padding-top: 20px;
+      }
+      .chart-body-select{
+        margin-top:20px;
+        text-align: center;
+        .select-label{
+          font-size: 15px;
+          color: #606266;
+          line-height: 40px;
+          font-weight:500;
+          padding: 0 6px 0 0
+        }
+      }
+    }
+  }
+  .chart-container{
+    background-color: $tableTitleColor !important;
+    border-top: 12px solid #ebebeb !important;
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..247c03d
--- /dev/null
+++ b/src/views/toilet/components/detail.vue
@@ -0,0 +1,431 @@
+<template>
+  <div class="info-block">
+    <div class="block-body">
+      <el-row class="body-right">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥梁名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.name }}</span>
+              <!--<div class="item-value-middle"><el-input v-model="bridgeForm.name" :disabled="disabled"/></div>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥型：</span>
+              <span class="item-value-middle">{{ bridgeForm.typeName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.typeName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">柱号：</span>
+              <span class="item-value-middle">{{ bridgeForm.bridgeCode }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">道路名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.roadName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.roadName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">高度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.height }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">长度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.length }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">开建时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.buildTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">通车时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.openTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁图片：</span>
+              <span v-show="photo===''" class="item-value-middle">无</span>
+              <el-image
+                v-if="photo!==''"
+                :src="photo!==''?photo:null"
+                fit="cover"
+                style="width: 430px; height: 275px; margin-top:20px; margin-left: 10px;vertical-align: top;"/>
+              <el-upload
+                ref="upload"
+                :before-upload="handleBeforeUpload"
+                :http-request="uploadPhoto"
+                :show-file-list="false"
+                style="display: inline-block;vertical-align: top;"
+                action="string"
+                accept=".jpg,.jpeg,.png">
+                <el-button v-show="isEditMode" class="edit_btn" type="primary" size="small" style="vertical-align: bottom;" @click="uploadPhoto">上传桥梁图片</el-button>
+              </el-upload>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title">桥梁位置：</span>
+              <span class="item-value-middle">{{ bridgeForm.position }}</span>
+              <el-button class="edit_btn" size="small" @click="checkMap">查看地图</el-button>
+              <div v-if="showMap" style="height: 480px; width: 800px; margin-left: 130px" id="map" keep-alive/>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁简介：</span>
+              <span v-show="!isEditMode" class="item-value-long">{{ bridgeForm.description }}</span>
+              <span v-show="isEditMode" class="item-value-long" ><el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" show-word-limit/></span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row v-show="isEditMode" style="margin-top: 30px;text-align: center">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="cancel">取消</el-button>
+        </el-row>
+      </el-row>
+    </div>
+    <div class="clearfloat"/>
+  </div>
+</template>
+<script>
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
+import L from 'leaflet'
+
+export default {
+  name: 'Detail',
+  data() {
+    return {
+      showMap: false,
+      isEditMode: false,
+      bridgeList: [
+        {id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450},
+        {id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659},
+        {id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659}
+      ],
+      map: null,
+      baselayer: [],
+      icon: 'static/images/well/0100.png',
+      photo: '',
+      bridgeForm: {
+        id: '',
+        name: '',
+        type: '',
+        typeName: '',
+        bridgeCode: '',
+        roadName: '',
+        height: '',
+        length: '',
+        buildTime: '',
+        openTime: '',
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: ''
+      },
+      // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
+      // token: '?token=' + this.$store.getters.token, // token,
+      disabled: true,
+      defaultPhoto: '' // require('../../../assets/global_images/photo.jpg') // 默认图片路径
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    fetchData(bridgeId) {
+      getDetail(bridgeId).then(response => {
+        this.bridgeForm = response.data
+        this.photo = this.bridgeForm.photo
+        this.listLoading = false
+      })
+    },
+    checkMap() {
+      this.initMap()
+      this.initMap()
+    },
+    initMap() {
+      debugger
+      this.showMap = true
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 18,
+        center: [27.763248, 116.043450],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.invalidateSize(true)
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      var Icon = L.icon({
+        iconUrl: require('../../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+      if(this.bridgeForm.name === '永胜桥') {
+        this.map.setView({ lat: 27.763248, lng: 116.043450 }, 16)
+        L.marker([27.763248, 116.043450], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '黄洲桥') {
+        this.map.setView({ lat: 27.760096, lng: 116.053659 }, 16)
+        L.marker([27.760096, 116.053659], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '光明桥') {
+        this.map.setView({ lat: 27.767046, lng: 116.058659 }, 16)
+        L.marker([27.767046, 116.058659], {
+          icon: Icon
+        }).addTo(this.map)
+      }
+    },
+    showUploadBut() {
+      this.isEditMode = true
+    },
+    saveData() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        let index = this.photo.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        this.bridgeForm.photo = this.photo.substring(index)
+      }
+      updateBridge(this.bridgeForm).then(res => {
+        if (res.code === 200) {
+          this.$message.success('编辑成功')
+        }
+      })
+      this.isEditMode = false
+    },
+    // 图片上传
+    uploadPhoto(file) {
+      // console.log('uploadFile:' + file.file.name)
+      // const base_url = process.env.BASE_API + '/static/'
+
+      // 转base64
+      this.getBase64(file.file).then(resBase64 => {
+        this.photo = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
+        console.log(this.photo)
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      console.log(file.size)
+      const isLt2M = file.size / 1024 < 200
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 200KB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      debugger
+      const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        this.photo = base_url + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    getBase64(file) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        let fileResult = ''
+        reader.readAsDataURL(file)
+        // 开始转
+        reader.onload = function() {
+          fileResult = reader.result
+        }
+        // 转 失败
+        reader.onerror = function(error) {
+          reject(error)
+        }
+        // 转 结束  咱就 resolve 出去
+        reader.onloadend = function() {
+          resolve(fileResult)
+        }
+      })
+    },
+    cancel() {
+      this.isEditMode = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $left-width: 160px;
+  .info-block{
+    /*overflow-y: scroll;*/
+    /*white-space: nowrap;*/
+    margin: 10px 20px;
+    padding-bottom: 120px;
+    /*overflow: ;*/
+    .block-title-div{
+      font-size: 17px;
+      color: #1f2d3d;
+      font-weight: bold;
+      /*border-bottom: 1px solid #d3dce6;*/
+      .block-title{
+        padding-left: 10px;
+        margin-bottom: 10px;
+        /*border-left: 5px solid #004493;*/
+      }
+    }
+    .block-body{
+      margin-top: 20px;
+      margin-left: 50px;
+      .body-left{
+        width: $left-width;
+        /*float: left;*/
+      }
+      .body-right{
+        width: calc( 100% - 160px );
+        float: left;
+        .item-div{
+          line-height: 55px;
+          font-size:17px;
+          .item-title{
+            text-align: right;
+            width:120px;
+            color: #909090;
+            font-weight: bold;
+            display: inline-block;
+          }
+          .item-value-middle{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 280px !important;
+            display: inline-block;
+          }
+          .item-value-long{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 680px !important;
+            display: inline-block;
+          }
+        }
+      }
+    }
+    .person-photo{
+      width: 106px;
+      height: 150px;
+      padding: 1px;
+      border: 1px solid #92dfff;
+    }
+
+  }
+  avatar-uploader .el-upload {
+    margin-left: 12px;
+    margin-top: 10px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  // 地图
+  .overview-map-container{
+    width: 100%;
+    padding: 5px;
+    .map-demo{
+      width: 100%;
+      height: calc(100vh - 78px);
+      .svg-icon{
+        width: 20px;
+        height: 20px;
+      }
+      .alarm-icon{
+        width:30px;
+        height: 30px;
+      }
+      .nomal-info-window{
+        background-color: pink;
+      }
+      .info-window{
+        max-width: 250px;
+        /*background-color: lightcyan;*/
+        .info-header{
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          font-weight: bold;
+          /*background-color: #eaf4ff;*/
+        }
+        .info-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+        }
+      }
+      .alarm-window{
+        max-width: 250px;
+        /*background-color: #ffeaf1;*/
+        .alarm-header {
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          color: red;
+          font-weight: bold;
+          /*background-color: #ffecec;*/
+        }
+        .alarm-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+          .alarm-red{
+            color: #ff0000;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
new file mode 100644
index 0000000..000deea
--- /dev/null
+++ b/src/views/toilet/components/editToilet.vue
@@ -0,0 +1,368 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="toiletForm" label-position="right" label-width="130px">
+      <div class="form-div">
+        <div class="form-left">
+          <el-row :gutter="20">
+            <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="20">
+            <el-col :span="12">
+              <el-form-item label="占地面积" prop="area">
+                <el-input v-model.trim="toiletForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+              </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="20">
+            <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="20">
+            <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="20">
+            <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"
+                  style="width: 100%"
+                  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 slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @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/',
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      photo: '', // 图片路径
+      defaultPhoto: require('../../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      toiletForm: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      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'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        debugger
+        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: '' // 备注
+      }
+      this.photo = ''
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      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()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      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
+            }
+          })
+        }
+      })
+    },
+    // 打开地图选点
+    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)
+    },
+    // 图片上传
+    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)
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    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/toilet/listToilet.vue b/src/views/toilet/listToilet.vue
new file mode 100644
index 0000000..2c5209e
--- /dev/null
+++ b/src/views/toilet/listToilet.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" 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.owner" size="small" placeholder="建设单位" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.position" size="small" placeholder="位置" clearable/>
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-toilet v-show="editShow" ref="edittoilet" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getToiletList, delToilet } from '@/api/sanitation/toilet'
+import EditToilet from './components/editToilet'
+
+export default {
+  name: 'ListToilet',
+  components: { EditToilet },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字（编号、名称）
+        owner: '', // 建设单位
+        position: '', // 道路
+        offset: 1,
+        limit: 20,
+        sort: 'ts',
+        order: 'desc'
+      }, // 筛选条件
+      timeRange: [],
+      columns: [
+        {
+          text: '公厕编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '公厕名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '建设单位',
+          value: 'owner',
+          align: 'center'
+        },
+        {
+          text: '建设时间',
+          value: 'ts',
+          align: 'center'
+        },
+        {
+          text: '街道',
+          value: 'position',
+          align: 'center'
+        },
+        {
+          text: '占地面积',
+          value: 'area',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'responsiblePerson',
+          align: 'center'
+        },
+        {
+          text: '责任人电话',
+          value: 'responsiblePersonTel',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  mounted() {
+    this.fetchData(false)// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getToiletList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('update', true, row)
+    },
+    // 删除单个公厕
+    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()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '识别记录列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/listWork.vue b/src/views/toilet/listWork.vue
new file mode 100644
index 0000000..9281717
--- /dev/null
+++ b/src/views/toilet/listWork.vue
@@ -0,0 +1,206 @@
+<template>
+  <app-container>
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @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="datetimerange"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
+      <template slot="btns">
+        <el-button 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 NormalTable from '@/components/NormalTable'
+import AppContainer from '@/components/layout/AppContainer'
+import SearchArea from '@/components/SearchArea/SearchArea'
+import SearchItem from '@/components/SearchArea/SearchItem'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
+export default {
+  name: 'ListWork',
+  components: { SearchItem, SearchArea, AppContainer, NormalTable },
+  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'
+        }
+      ], // 显示列
+      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
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
+    },
+    // 点击详情
+    goDetail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    // 批量导出
+    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: '', // 关键字
+        type: '', // 公厕类型
+        post: '', // 岗位
+        ts: '', // 入职年月时间
+        jobCode: '', // 作业内容
+        responseArea: '', // 负责片区
+        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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/pieChart.vue b/src/views/statistics/pieChart.vue
new file mode 100644
index 0000000..e4dd287
--- /dev/null
+++ b/src/views/statistics/pieChart.vue
@@ -0,0 +1,58 @@
+<template>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'PieChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    this.extend = {}
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      countByDay(this.listQuery).then(response => {
+        this.data.rows = response.data
+      })
+    }
+  }
+}
+</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/statisticsChart.vue b/src/views/statistics/statisticsChart.vue
new file mode 100644
index 0000000..2c48fe0
--- /dev/null
+++ b/src/views/statistics/statisticsChart.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="chart-container">
+    <div ref="chart" class="chart-body" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+export default {
+  name: 'StatisticsChart',
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  computed: {
+    pieData() {
+      const tmp = []
+      this.list.forEach((item, index) => {
+        const obj = {}
+        obj.name = item.deptName
+        obj.value = item.num
+        tmp.push(obj)
+      })
+      return tmp
+    }
+  },
+  watch: {
+    list() {
+      this.initChart()
+    }
+  },
+  activated() {
+    this.initChart()
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.chart)
+      this.chart.setOption({
+        // tooltip: {
+        //   show: true
+        // }
+        // color: [
+        //   '#19d4ae', '#5ab1ef', '#fa6e86',
+        //   '#ffb980', '#0067a6', '#c4b4e4',
+        //   '#d87a80', '#9cbbff', '#d9d0c7',
+        //   '#87a997', '#d49ea2', '#5b4947',
+        //   '#7ba3a8'
+        // ]
+        // legend: {
+        //   orient: 'vertical',
+        //   right: 0,
+        //   data: this.pieData.map(item => item.name)
+        // }
+        // series: [{
+        //   name: '进出记录',
+        //   type: 'pie',
+        //   data: this.pieData,
+        //   label: {
+        //     show: true
+        //     // formatter: '{b}记录数:{c}条'
+        //   },
+        //   tooltip: {
+        //     // formatter: '{b}<br/>记录数: {d}%,{c}条'
+        //   }
+        // }]
+      })
+      this.chart.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container{
+  text-align: center;
+}
+.chart-body{
+  height: 60vh;
+  width: 80%;
+  margin-right: auto;
+  margin-left: auto;
+}
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..67aa32b
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,242 @@
+<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'
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      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/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..50a07f2
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,191 @@
+<template>
+  <app-container>
+    <!--<div class="statistic-container">-->
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-date-picker
+          v-model="year"
+          type="year"
+          placeholder="请选择统计年份"
+          value-format="yyyy"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="month"
+          type="month"
+          placeholder="请选择统计年月"
+          value-format="yyyy-MM"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData1">
+          <el-option
+            v-for="item in toiletList"
+            :key="item.toiletId"
+            :label="item.name"
+            :value="item.toiletId"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <div class="chart-container">
+      <el-row>
+        <el-col :span="24" class="chart-body" >
+          <div class="chart-body-title">按年/月清洁次数统计</div>
+          <bar-chart ref="chart1"/>
+        </el-col>
+      <!--<el-col :span="12" class="chart-body" >-->
+      <!--<div class="chart-body-select">-->
+      <!--<el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData2">-->
+      <!--<el-option-->
+      <!--v-for="item in toiletList"-->
+      <!--:key="item.toiletId"-->
+      <!--:label="item.name"-->
+      <!--:value="item.toiletId"/>-->
+      <!--</el-select>-->
+      <!--</div>-->
+      <!--<div class="chart-body-title" style="padding-top: 20px">按年/月清洁次数统计</div>-->
+      <!--<bar-chart ref="chart2"/>-->
+      <!--</el-col>-->
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+import { getDayTime } from '@/utils/dateutils'
+import DeptSelect from '@/components/DeptSelect/index'
+import PieChart from './pieChart'
+import BarChart from './barChart'
+
+export default {
+  name: 'WorkStatistics',
+  components: { BarChart, PieChart, DeptSelect },
+  data() {
+    return {
+      year: '',
+      month: '',
+      listQuery: {
+        staticType: 'year',
+        toiletId: '',
+        startTime: '2020-01-01',
+        endTime: '2020-12-30'
+      },
+      toiletList: [{ toiletId: '9461', name: '公厕1' }, { toiletId: '9462', name: '公厕2' }, { toiletId: '9463', name: '公厕3' }], // 显示列
+      list: [], // 列表数据
+      chartList: [],
+      chartList2: [],
+      chartshow: false
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData1()
+    // this.fetchData2()
+  },
+  methods: {
+    // 获取统计数据
+    fetchData1() {
+      this.$refs.chart1.fetchData(this.listQuery)
+    },
+    fetchData2() {
+      this.$refs.chart2.fetchData(this.listQuery)
+    },
+    changeDate(date) {
+      let beginTime, endTime
+
+      if (date === 'today') {
+        beginTime = getDayTime(new Date().getTime())
+        endTime = new Date()
+        this.timeRange = [beginTime, endTime]
+      } else if (date === 'yesterday') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
+        endTime = getDayTime(new Date().getTime())
+      } else if (date === 'sevendays') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+        endTime = new Date()
+      } else if (date === 'lastmonth') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+        endTime = new Date()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      // this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleColor:#fff;
+  .app-container{
+    padding: 5px 10px 10px 10px;
+    .statistic-container{
+      margin: 10px;
+      padding:0px;
+      border: 1px solid #d3dce6;
+      .chart-tools{
+        background-color: #f2f2f2;
+        line-height: 40px;
+        padding-left: 10px;
+        padding-right: 5px;
+        .chart-tool-text{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button:hover{
+          background-color: #8cc5ff;
+          cursor: pointer;
+          color:white
+        }
+        .chart-tool-button:active{
+          background-color: #8cc5ff;
+          color:white
+        }
+        .editor--datetimerange.el-input__inner{
+          width: 300px;
+        }
+      }
+      .chart-title{
+        margin: auto;
+        text-align: center;
+        margin-top: 15px;
+      }
+    }
+    .chart-body{
+      padding:15px;
+      .chart-body-title {
+        font-size:22px;
+        text-align: center;
+        background-color: white;
+        padding-top: 20px;
+      }
+      .chart-body-select{
+        margin-top:20px;
+        text-align: center;
+        .select-label{
+          font-size: 15px;
+          color: #606266;
+          line-height: 40px;
+          font-weight:500;
+          padding: 0 6px 0 0
+        }
+      }
+    }
+  }
+  .chart-container{
+    background-color: $tableTitleColor !important;
+    border-top: 12px solid #ebebeb !important;
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..247c03d
--- /dev/null
+++ b/src/views/toilet/components/detail.vue
@@ -0,0 +1,431 @@
+<template>
+  <div class="info-block">
+    <div class="block-body">
+      <el-row class="body-right">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥梁名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.name }}</span>
+              <!--<div class="item-value-middle"><el-input v-model="bridgeForm.name" :disabled="disabled"/></div>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥型：</span>
+              <span class="item-value-middle">{{ bridgeForm.typeName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.typeName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">柱号：</span>
+              <span class="item-value-middle">{{ bridgeForm.bridgeCode }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">道路名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.roadName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.roadName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">高度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.height }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">长度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.length }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">开建时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.buildTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">通车时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.openTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁图片：</span>
+              <span v-show="photo===''" class="item-value-middle">无</span>
+              <el-image
+                v-if="photo!==''"
+                :src="photo!==''?photo:null"
+                fit="cover"
+                style="width: 430px; height: 275px; margin-top:20px; margin-left: 10px;vertical-align: top;"/>
+              <el-upload
+                ref="upload"
+                :before-upload="handleBeforeUpload"
+                :http-request="uploadPhoto"
+                :show-file-list="false"
+                style="display: inline-block;vertical-align: top;"
+                action="string"
+                accept=".jpg,.jpeg,.png">
+                <el-button v-show="isEditMode" class="edit_btn" type="primary" size="small" style="vertical-align: bottom;" @click="uploadPhoto">上传桥梁图片</el-button>
+              </el-upload>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title">桥梁位置：</span>
+              <span class="item-value-middle">{{ bridgeForm.position }}</span>
+              <el-button class="edit_btn" size="small" @click="checkMap">查看地图</el-button>
+              <div v-if="showMap" style="height: 480px; width: 800px; margin-left: 130px" id="map" keep-alive/>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁简介：</span>
+              <span v-show="!isEditMode" class="item-value-long">{{ bridgeForm.description }}</span>
+              <span v-show="isEditMode" class="item-value-long" ><el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" show-word-limit/></span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row v-show="isEditMode" style="margin-top: 30px;text-align: center">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="cancel">取消</el-button>
+        </el-row>
+      </el-row>
+    </div>
+    <div class="clearfloat"/>
+  </div>
+</template>
+<script>
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
+import L from 'leaflet'
+
+export default {
+  name: 'Detail',
+  data() {
+    return {
+      showMap: false,
+      isEditMode: false,
+      bridgeList: [
+        {id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450},
+        {id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659},
+        {id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659}
+      ],
+      map: null,
+      baselayer: [],
+      icon: 'static/images/well/0100.png',
+      photo: '',
+      bridgeForm: {
+        id: '',
+        name: '',
+        type: '',
+        typeName: '',
+        bridgeCode: '',
+        roadName: '',
+        height: '',
+        length: '',
+        buildTime: '',
+        openTime: '',
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: ''
+      },
+      // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
+      // token: '?token=' + this.$store.getters.token, // token,
+      disabled: true,
+      defaultPhoto: '' // require('../../../assets/global_images/photo.jpg') // 默认图片路径
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    fetchData(bridgeId) {
+      getDetail(bridgeId).then(response => {
+        this.bridgeForm = response.data
+        this.photo = this.bridgeForm.photo
+        this.listLoading = false
+      })
+    },
+    checkMap() {
+      this.initMap()
+      this.initMap()
+    },
+    initMap() {
+      debugger
+      this.showMap = true
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 18,
+        center: [27.763248, 116.043450],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.invalidateSize(true)
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      var Icon = L.icon({
+        iconUrl: require('../../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+      if(this.bridgeForm.name === '永胜桥') {
+        this.map.setView({ lat: 27.763248, lng: 116.043450 }, 16)
+        L.marker([27.763248, 116.043450], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '黄洲桥') {
+        this.map.setView({ lat: 27.760096, lng: 116.053659 }, 16)
+        L.marker([27.760096, 116.053659], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '光明桥') {
+        this.map.setView({ lat: 27.767046, lng: 116.058659 }, 16)
+        L.marker([27.767046, 116.058659], {
+          icon: Icon
+        }).addTo(this.map)
+      }
+    },
+    showUploadBut() {
+      this.isEditMode = true
+    },
+    saveData() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        let index = this.photo.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        this.bridgeForm.photo = this.photo.substring(index)
+      }
+      updateBridge(this.bridgeForm).then(res => {
+        if (res.code === 200) {
+          this.$message.success('编辑成功')
+        }
+      })
+      this.isEditMode = false
+    },
+    // 图片上传
+    uploadPhoto(file) {
+      // console.log('uploadFile:' + file.file.name)
+      // const base_url = process.env.BASE_API + '/static/'
+
+      // 转base64
+      this.getBase64(file.file).then(resBase64 => {
+        this.photo = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
+        console.log(this.photo)
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      console.log(file.size)
+      const isLt2M = file.size / 1024 < 200
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 200KB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      debugger
+      const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        this.photo = base_url + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    getBase64(file) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        let fileResult = ''
+        reader.readAsDataURL(file)
+        // 开始转
+        reader.onload = function() {
+          fileResult = reader.result
+        }
+        // 转 失败
+        reader.onerror = function(error) {
+          reject(error)
+        }
+        // 转 结束  咱就 resolve 出去
+        reader.onloadend = function() {
+          resolve(fileResult)
+        }
+      })
+    },
+    cancel() {
+      this.isEditMode = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $left-width: 160px;
+  .info-block{
+    /*overflow-y: scroll;*/
+    /*white-space: nowrap;*/
+    margin: 10px 20px;
+    padding-bottom: 120px;
+    /*overflow: ;*/
+    .block-title-div{
+      font-size: 17px;
+      color: #1f2d3d;
+      font-weight: bold;
+      /*border-bottom: 1px solid #d3dce6;*/
+      .block-title{
+        padding-left: 10px;
+        margin-bottom: 10px;
+        /*border-left: 5px solid #004493;*/
+      }
+    }
+    .block-body{
+      margin-top: 20px;
+      margin-left: 50px;
+      .body-left{
+        width: $left-width;
+        /*float: left;*/
+      }
+      .body-right{
+        width: calc( 100% - 160px );
+        float: left;
+        .item-div{
+          line-height: 55px;
+          font-size:17px;
+          .item-title{
+            text-align: right;
+            width:120px;
+            color: #909090;
+            font-weight: bold;
+            display: inline-block;
+          }
+          .item-value-middle{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 280px !important;
+            display: inline-block;
+          }
+          .item-value-long{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 680px !important;
+            display: inline-block;
+          }
+        }
+      }
+    }
+    .person-photo{
+      width: 106px;
+      height: 150px;
+      padding: 1px;
+      border: 1px solid #92dfff;
+    }
+
+  }
+  avatar-uploader .el-upload {
+    margin-left: 12px;
+    margin-top: 10px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  // 地图
+  .overview-map-container{
+    width: 100%;
+    padding: 5px;
+    .map-demo{
+      width: 100%;
+      height: calc(100vh - 78px);
+      .svg-icon{
+        width: 20px;
+        height: 20px;
+      }
+      .alarm-icon{
+        width:30px;
+        height: 30px;
+      }
+      .nomal-info-window{
+        background-color: pink;
+      }
+      .info-window{
+        max-width: 250px;
+        /*background-color: lightcyan;*/
+        .info-header{
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          font-weight: bold;
+          /*background-color: #eaf4ff;*/
+        }
+        .info-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+        }
+      }
+      .alarm-window{
+        max-width: 250px;
+        /*background-color: #ffeaf1;*/
+        .alarm-header {
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          color: red;
+          font-weight: bold;
+          /*background-color: #ffecec;*/
+        }
+        .alarm-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+          .alarm-red{
+            color: #ff0000;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
new file mode 100644
index 0000000..000deea
--- /dev/null
+++ b/src/views/toilet/components/editToilet.vue
@@ -0,0 +1,368 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="toiletForm" label-position="right" label-width="130px">
+      <div class="form-div">
+        <div class="form-left">
+          <el-row :gutter="20">
+            <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="20">
+            <el-col :span="12">
+              <el-form-item label="占地面积" prop="area">
+                <el-input v-model.trim="toiletForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+              </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="20">
+            <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="20">
+            <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="20">
+            <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"
+                  style="width: 100%"
+                  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 slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @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/',
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      photo: '', // 图片路径
+      defaultPhoto: require('../../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      toiletForm: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      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'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        debugger
+        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: '' // 备注
+      }
+      this.photo = ''
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      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()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      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
+            }
+          })
+        }
+      })
+    },
+    // 打开地图选点
+    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)
+    },
+    // 图片上传
+    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)
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    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/toilet/listToilet.vue b/src/views/toilet/listToilet.vue
new file mode 100644
index 0000000..2c5209e
--- /dev/null
+++ b/src/views/toilet/listToilet.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" 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.owner" size="small" placeholder="建设单位" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.position" size="small" placeholder="位置" clearable/>
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-toilet v-show="editShow" ref="edittoilet" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getToiletList, delToilet } from '@/api/sanitation/toilet'
+import EditToilet from './components/editToilet'
+
+export default {
+  name: 'ListToilet',
+  components: { EditToilet },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字（编号、名称）
+        owner: '', // 建设单位
+        position: '', // 道路
+        offset: 1,
+        limit: 20,
+        sort: 'ts',
+        order: 'desc'
+      }, // 筛选条件
+      timeRange: [],
+      columns: [
+        {
+          text: '公厕编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '公厕名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '建设单位',
+          value: 'owner',
+          align: 'center'
+        },
+        {
+          text: '建设时间',
+          value: 'ts',
+          align: 'center'
+        },
+        {
+          text: '街道',
+          value: 'position',
+          align: 'center'
+        },
+        {
+          text: '占地面积',
+          value: 'area',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'responsiblePerson',
+          align: 'center'
+        },
+        {
+          text: '责任人电话',
+          value: 'responsiblePersonTel',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  mounted() {
+    this.fetchData(false)// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getToiletList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('update', true, row)
+    },
+    // 删除单个公厕
+    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()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '识别记录列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/listWork.vue b/src/views/toilet/listWork.vue
new file mode 100644
index 0000000..9281717
--- /dev/null
+++ b/src/views/toilet/listWork.vue
@@ -0,0 +1,206 @@
+<template>
+  <app-container>
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @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="datetimerange"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
+      <template slot="btns">
+        <el-button 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 NormalTable from '@/components/NormalTable'
+import AppContainer from '@/components/layout/AppContainer'
+import SearchArea from '@/components/SearchArea/SearchArea'
+import SearchItem from '@/components/SearchArea/SearchItem'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
+export default {
+  name: 'ListWork',
+  components: { SearchItem, SearchArea, AppContainer, NormalTable },
+  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'
+        }
+      ], // 显示列
+      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
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
+    },
+    // 点击详情
+    goDetail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    // 批量导出
+    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: '', // 关键字
+        type: '', // 公厕类型
+        post: '', // 岗位
+        ts: '', // 入职年月时间
+        jobCode: '', // 作业内容
+        responseArea: '', // 负责片区
+        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/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
new file mode 100644
index 0000000..9ed5b84
--- /dev/null
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -0,0 +1,210 @@
+<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'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+
+export default {
+  name: 'ToiletCleanList',
+  data() {
+    return {
+      dateRange: [getLastWeek('yyyy-MM-dd hh:mm:ss'), getToday('yyyy-MM-dd hh:mm:ss')], // 日期范围
+      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.dateRange = [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')]
+    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 && 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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/pieChart.vue b/src/views/statistics/pieChart.vue
new file mode 100644
index 0000000..e4dd287
--- /dev/null
+++ b/src/views/statistics/pieChart.vue
@@ -0,0 +1,58 @@
+<template>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'PieChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    this.extend = {}
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      countByDay(this.listQuery).then(response => {
+        this.data.rows = response.data
+      })
+    }
+  }
+}
+</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/statisticsChart.vue b/src/views/statistics/statisticsChart.vue
new file mode 100644
index 0000000..2c48fe0
--- /dev/null
+++ b/src/views/statistics/statisticsChart.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="chart-container">
+    <div ref="chart" class="chart-body" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+export default {
+  name: 'StatisticsChart',
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  computed: {
+    pieData() {
+      const tmp = []
+      this.list.forEach((item, index) => {
+        const obj = {}
+        obj.name = item.deptName
+        obj.value = item.num
+        tmp.push(obj)
+      })
+      return tmp
+    }
+  },
+  watch: {
+    list() {
+      this.initChart()
+    }
+  },
+  activated() {
+    this.initChart()
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.chart)
+      this.chart.setOption({
+        // tooltip: {
+        //   show: true
+        // }
+        // color: [
+        //   '#19d4ae', '#5ab1ef', '#fa6e86',
+        //   '#ffb980', '#0067a6', '#c4b4e4',
+        //   '#d87a80', '#9cbbff', '#d9d0c7',
+        //   '#87a997', '#d49ea2', '#5b4947',
+        //   '#7ba3a8'
+        // ]
+        // legend: {
+        //   orient: 'vertical',
+        //   right: 0,
+        //   data: this.pieData.map(item => item.name)
+        // }
+        // series: [{
+        //   name: '进出记录',
+        //   type: 'pie',
+        //   data: this.pieData,
+        //   label: {
+        //     show: true
+        //     // formatter: '{b}记录数:{c}条'
+        //   },
+        //   tooltip: {
+        //     // formatter: '{b}<br/>记录数: {d}%,{c}条'
+        //   }
+        // }]
+      })
+      this.chart.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container{
+  text-align: center;
+}
+.chart-body{
+  height: 60vh;
+  width: 80%;
+  margin-right: auto;
+  margin-left: auto;
+}
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..67aa32b
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,242 @@
+<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'
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      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/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..50a07f2
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,191 @@
+<template>
+  <app-container>
+    <!--<div class="statistic-container">-->
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-date-picker
+          v-model="year"
+          type="year"
+          placeholder="请选择统计年份"
+          value-format="yyyy"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="month"
+          type="month"
+          placeholder="请选择统计年月"
+          value-format="yyyy-MM"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData1">
+          <el-option
+            v-for="item in toiletList"
+            :key="item.toiletId"
+            :label="item.name"
+            :value="item.toiletId"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <div class="chart-container">
+      <el-row>
+        <el-col :span="24" class="chart-body" >
+          <div class="chart-body-title">按年/月清洁次数统计</div>
+          <bar-chart ref="chart1"/>
+        </el-col>
+      <!--<el-col :span="12" class="chart-body" >-->
+      <!--<div class="chart-body-select">-->
+      <!--<el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData2">-->
+      <!--<el-option-->
+      <!--v-for="item in toiletList"-->
+      <!--:key="item.toiletId"-->
+      <!--:label="item.name"-->
+      <!--:value="item.toiletId"/>-->
+      <!--</el-select>-->
+      <!--</div>-->
+      <!--<div class="chart-body-title" style="padding-top: 20px">按年/月清洁次数统计</div>-->
+      <!--<bar-chart ref="chart2"/>-->
+      <!--</el-col>-->
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+import { getDayTime } from '@/utils/dateutils'
+import DeptSelect from '@/components/DeptSelect/index'
+import PieChart from './pieChart'
+import BarChart from './barChart'
+
+export default {
+  name: 'WorkStatistics',
+  components: { BarChart, PieChart, DeptSelect },
+  data() {
+    return {
+      year: '',
+      month: '',
+      listQuery: {
+        staticType: 'year',
+        toiletId: '',
+        startTime: '2020-01-01',
+        endTime: '2020-12-30'
+      },
+      toiletList: [{ toiletId: '9461', name: '公厕1' }, { toiletId: '9462', name: '公厕2' }, { toiletId: '9463', name: '公厕3' }], // 显示列
+      list: [], // 列表数据
+      chartList: [],
+      chartList2: [],
+      chartshow: false
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData1()
+    // this.fetchData2()
+  },
+  methods: {
+    // 获取统计数据
+    fetchData1() {
+      this.$refs.chart1.fetchData(this.listQuery)
+    },
+    fetchData2() {
+      this.$refs.chart2.fetchData(this.listQuery)
+    },
+    changeDate(date) {
+      let beginTime, endTime
+
+      if (date === 'today') {
+        beginTime = getDayTime(new Date().getTime())
+        endTime = new Date()
+        this.timeRange = [beginTime, endTime]
+      } else if (date === 'yesterday') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
+        endTime = getDayTime(new Date().getTime())
+      } else if (date === 'sevendays') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+        endTime = new Date()
+      } else if (date === 'lastmonth') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+        endTime = new Date()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      // this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleColor:#fff;
+  .app-container{
+    padding: 5px 10px 10px 10px;
+    .statistic-container{
+      margin: 10px;
+      padding:0px;
+      border: 1px solid #d3dce6;
+      .chart-tools{
+        background-color: #f2f2f2;
+        line-height: 40px;
+        padding-left: 10px;
+        padding-right: 5px;
+        .chart-tool-text{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button:hover{
+          background-color: #8cc5ff;
+          cursor: pointer;
+          color:white
+        }
+        .chart-tool-button:active{
+          background-color: #8cc5ff;
+          color:white
+        }
+        .editor--datetimerange.el-input__inner{
+          width: 300px;
+        }
+      }
+      .chart-title{
+        margin: auto;
+        text-align: center;
+        margin-top: 15px;
+      }
+    }
+    .chart-body{
+      padding:15px;
+      .chart-body-title {
+        font-size:22px;
+        text-align: center;
+        background-color: white;
+        padding-top: 20px;
+      }
+      .chart-body-select{
+        margin-top:20px;
+        text-align: center;
+        .select-label{
+          font-size: 15px;
+          color: #606266;
+          line-height: 40px;
+          font-weight:500;
+          padding: 0 6px 0 0
+        }
+      }
+    }
+  }
+  .chart-container{
+    background-color: $tableTitleColor !important;
+    border-top: 12px solid #ebebeb !important;
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..247c03d
--- /dev/null
+++ b/src/views/toilet/components/detail.vue
@@ -0,0 +1,431 @@
+<template>
+  <div class="info-block">
+    <div class="block-body">
+      <el-row class="body-right">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥梁名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.name }}</span>
+              <!--<div class="item-value-middle"><el-input v-model="bridgeForm.name" :disabled="disabled"/></div>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥型：</span>
+              <span class="item-value-middle">{{ bridgeForm.typeName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.typeName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">柱号：</span>
+              <span class="item-value-middle">{{ bridgeForm.bridgeCode }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">道路名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.roadName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.roadName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">高度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.height }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">长度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.length }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">开建时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.buildTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">通车时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.openTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁图片：</span>
+              <span v-show="photo===''" class="item-value-middle">无</span>
+              <el-image
+                v-if="photo!==''"
+                :src="photo!==''?photo:null"
+                fit="cover"
+                style="width: 430px; height: 275px; margin-top:20px; margin-left: 10px;vertical-align: top;"/>
+              <el-upload
+                ref="upload"
+                :before-upload="handleBeforeUpload"
+                :http-request="uploadPhoto"
+                :show-file-list="false"
+                style="display: inline-block;vertical-align: top;"
+                action="string"
+                accept=".jpg,.jpeg,.png">
+                <el-button v-show="isEditMode" class="edit_btn" type="primary" size="small" style="vertical-align: bottom;" @click="uploadPhoto">上传桥梁图片</el-button>
+              </el-upload>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title">桥梁位置：</span>
+              <span class="item-value-middle">{{ bridgeForm.position }}</span>
+              <el-button class="edit_btn" size="small" @click="checkMap">查看地图</el-button>
+              <div v-if="showMap" style="height: 480px; width: 800px; margin-left: 130px" id="map" keep-alive/>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁简介：</span>
+              <span v-show="!isEditMode" class="item-value-long">{{ bridgeForm.description }}</span>
+              <span v-show="isEditMode" class="item-value-long" ><el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" show-word-limit/></span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row v-show="isEditMode" style="margin-top: 30px;text-align: center">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="cancel">取消</el-button>
+        </el-row>
+      </el-row>
+    </div>
+    <div class="clearfloat"/>
+  </div>
+</template>
+<script>
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
+import L from 'leaflet'
+
+export default {
+  name: 'Detail',
+  data() {
+    return {
+      showMap: false,
+      isEditMode: false,
+      bridgeList: [
+        {id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450},
+        {id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659},
+        {id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659}
+      ],
+      map: null,
+      baselayer: [],
+      icon: 'static/images/well/0100.png',
+      photo: '',
+      bridgeForm: {
+        id: '',
+        name: '',
+        type: '',
+        typeName: '',
+        bridgeCode: '',
+        roadName: '',
+        height: '',
+        length: '',
+        buildTime: '',
+        openTime: '',
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: ''
+      },
+      // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
+      // token: '?token=' + this.$store.getters.token, // token,
+      disabled: true,
+      defaultPhoto: '' // require('../../../assets/global_images/photo.jpg') // 默认图片路径
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    fetchData(bridgeId) {
+      getDetail(bridgeId).then(response => {
+        this.bridgeForm = response.data
+        this.photo = this.bridgeForm.photo
+        this.listLoading = false
+      })
+    },
+    checkMap() {
+      this.initMap()
+      this.initMap()
+    },
+    initMap() {
+      debugger
+      this.showMap = true
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 18,
+        center: [27.763248, 116.043450],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.invalidateSize(true)
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      var Icon = L.icon({
+        iconUrl: require('../../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+      if(this.bridgeForm.name === '永胜桥') {
+        this.map.setView({ lat: 27.763248, lng: 116.043450 }, 16)
+        L.marker([27.763248, 116.043450], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '黄洲桥') {
+        this.map.setView({ lat: 27.760096, lng: 116.053659 }, 16)
+        L.marker([27.760096, 116.053659], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '光明桥') {
+        this.map.setView({ lat: 27.767046, lng: 116.058659 }, 16)
+        L.marker([27.767046, 116.058659], {
+          icon: Icon
+        }).addTo(this.map)
+      }
+    },
+    showUploadBut() {
+      this.isEditMode = true
+    },
+    saveData() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        let index = this.photo.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        this.bridgeForm.photo = this.photo.substring(index)
+      }
+      updateBridge(this.bridgeForm).then(res => {
+        if (res.code === 200) {
+          this.$message.success('编辑成功')
+        }
+      })
+      this.isEditMode = false
+    },
+    // 图片上传
+    uploadPhoto(file) {
+      // console.log('uploadFile:' + file.file.name)
+      // const base_url = process.env.BASE_API + '/static/'
+
+      // 转base64
+      this.getBase64(file.file).then(resBase64 => {
+        this.photo = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
+        console.log(this.photo)
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      console.log(file.size)
+      const isLt2M = file.size / 1024 < 200
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 200KB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      debugger
+      const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        this.photo = base_url + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    getBase64(file) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        let fileResult = ''
+        reader.readAsDataURL(file)
+        // 开始转
+        reader.onload = function() {
+          fileResult = reader.result
+        }
+        // 转 失败
+        reader.onerror = function(error) {
+          reject(error)
+        }
+        // 转 结束  咱就 resolve 出去
+        reader.onloadend = function() {
+          resolve(fileResult)
+        }
+      })
+    },
+    cancel() {
+      this.isEditMode = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $left-width: 160px;
+  .info-block{
+    /*overflow-y: scroll;*/
+    /*white-space: nowrap;*/
+    margin: 10px 20px;
+    padding-bottom: 120px;
+    /*overflow: ;*/
+    .block-title-div{
+      font-size: 17px;
+      color: #1f2d3d;
+      font-weight: bold;
+      /*border-bottom: 1px solid #d3dce6;*/
+      .block-title{
+        padding-left: 10px;
+        margin-bottom: 10px;
+        /*border-left: 5px solid #004493;*/
+      }
+    }
+    .block-body{
+      margin-top: 20px;
+      margin-left: 50px;
+      .body-left{
+        width: $left-width;
+        /*float: left;*/
+      }
+      .body-right{
+        width: calc( 100% - 160px );
+        float: left;
+        .item-div{
+          line-height: 55px;
+          font-size:17px;
+          .item-title{
+            text-align: right;
+            width:120px;
+            color: #909090;
+            font-weight: bold;
+            display: inline-block;
+          }
+          .item-value-middle{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 280px !important;
+            display: inline-block;
+          }
+          .item-value-long{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 680px !important;
+            display: inline-block;
+          }
+        }
+      }
+    }
+    .person-photo{
+      width: 106px;
+      height: 150px;
+      padding: 1px;
+      border: 1px solid #92dfff;
+    }
+
+  }
+  avatar-uploader .el-upload {
+    margin-left: 12px;
+    margin-top: 10px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  // 地图
+  .overview-map-container{
+    width: 100%;
+    padding: 5px;
+    .map-demo{
+      width: 100%;
+      height: calc(100vh - 78px);
+      .svg-icon{
+        width: 20px;
+        height: 20px;
+      }
+      .alarm-icon{
+        width:30px;
+        height: 30px;
+      }
+      .nomal-info-window{
+        background-color: pink;
+      }
+      .info-window{
+        max-width: 250px;
+        /*background-color: lightcyan;*/
+        .info-header{
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          font-weight: bold;
+          /*background-color: #eaf4ff;*/
+        }
+        .info-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+        }
+      }
+      .alarm-window{
+        max-width: 250px;
+        /*background-color: #ffeaf1;*/
+        .alarm-header {
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          color: red;
+          font-weight: bold;
+          /*background-color: #ffecec;*/
+        }
+        .alarm-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+          .alarm-red{
+            color: #ff0000;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
new file mode 100644
index 0000000..000deea
--- /dev/null
+++ b/src/views/toilet/components/editToilet.vue
@@ -0,0 +1,368 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="toiletForm" label-position="right" label-width="130px">
+      <div class="form-div">
+        <div class="form-left">
+          <el-row :gutter="20">
+            <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="20">
+            <el-col :span="12">
+              <el-form-item label="占地面积" prop="area">
+                <el-input v-model.trim="toiletForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+              </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="20">
+            <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="20">
+            <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="20">
+            <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"
+                  style="width: 100%"
+                  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 slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @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/',
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      photo: '', // 图片路径
+      defaultPhoto: require('../../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      toiletForm: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      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'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        debugger
+        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: '' // 备注
+      }
+      this.photo = ''
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      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()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      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
+            }
+          })
+        }
+      })
+    },
+    // 打开地图选点
+    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)
+    },
+    // 图片上传
+    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)
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    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/toilet/listToilet.vue b/src/views/toilet/listToilet.vue
new file mode 100644
index 0000000..2c5209e
--- /dev/null
+++ b/src/views/toilet/listToilet.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" 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.owner" size="small" placeholder="建设单位" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.position" size="small" placeholder="位置" clearable/>
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-toilet v-show="editShow" ref="edittoilet" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getToiletList, delToilet } from '@/api/sanitation/toilet'
+import EditToilet from './components/editToilet'
+
+export default {
+  name: 'ListToilet',
+  components: { EditToilet },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字（编号、名称）
+        owner: '', // 建设单位
+        position: '', // 道路
+        offset: 1,
+        limit: 20,
+        sort: 'ts',
+        order: 'desc'
+      }, // 筛选条件
+      timeRange: [],
+      columns: [
+        {
+          text: '公厕编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '公厕名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '建设单位',
+          value: 'owner',
+          align: 'center'
+        },
+        {
+          text: '建设时间',
+          value: 'ts',
+          align: 'center'
+        },
+        {
+          text: '街道',
+          value: 'position',
+          align: 'center'
+        },
+        {
+          text: '占地面积',
+          value: 'area',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'responsiblePerson',
+          align: 'center'
+        },
+        {
+          text: '责任人电话',
+          value: 'responsiblePersonTel',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  mounted() {
+    this.fetchData(false)// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getToiletList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('update', true, row)
+    },
+    // 删除单个公厕
+    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()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '识别记录列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/listWork.vue b/src/views/toilet/listWork.vue
new file mode 100644
index 0000000..9281717
--- /dev/null
+++ b/src/views/toilet/listWork.vue
@@ -0,0 +1,206 @@
+<template>
+  <app-container>
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @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="datetimerange"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
+      <template slot="btns">
+        <el-button 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 NormalTable from '@/components/NormalTable'
+import AppContainer from '@/components/layout/AppContainer'
+import SearchArea from '@/components/SearchArea/SearchArea'
+import SearchItem from '@/components/SearchArea/SearchItem'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
+export default {
+  name: 'ListWork',
+  components: { SearchItem, SearchArea, AppContainer, NormalTable },
+  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'
+        }
+      ], // 显示列
+      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
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
+    },
+    // 点击详情
+    goDetail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    // 批量导出
+    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: '', // 关键字
+        type: '', // 公厕类型
+        post: '', // 岗位
+        ts: '', // 入职年月时间
+        jobCode: '', // 作业内容
+        responseArea: '', // 负责片区
+        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/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
new file mode 100644
index 0000000..9ed5b84
--- /dev/null
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -0,0 +1,210 @@
+<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'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+
+export default {
+  name: 'ToiletCleanList',
+  data() {
+    return {
+      dateRange: [getLastWeek('yyyy-MM-dd hh:mm:ss'), getToday('yyyy-MM-dd hh:mm:ss')], // 日期范围
+      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.dateRange = [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')]
+    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 && 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..1323d1e
--- /dev/null
+++ b/src/views/toiletManage/editToilet.vue
@@ -0,0 +1,407 @@
+<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="占地面积(m²)" 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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/pieChart.vue b/src/views/statistics/pieChart.vue
new file mode 100644
index 0000000..e4dd287
--- /dev/null
+++ b/src/views/statistics/pieChart.vue
@@ -0,0 +1,58 @@
+<template>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'PieChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    this.extend = {}
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      countByDay(this.listQuery).then(response => {
+        this.data.rows = response.data
+      })
+    }
+  }
+}
+</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/statisticsChart.vue b/src/views/statistics/statisticsChart.vue
new file mode 100644
index 0000000..2c48fe0
--- /dev/null
+++ b/src/views/statistics/statisticsChart.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="chart-container">
+    <div ref="chart" class="chart-body" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+export default {
+  name: 'StatisticsChart',
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  computed: {
+    pieData() {
+      const tmp = []
+      this.list.forEach((item, index) => {
+        const obj = {}
+        obj.name = item.deptName
+        obj.value = item.num
+        tmp.push(obj)
+      })
+      return tmp
+    }
+  },
+  watch: {
+    list() {
+      this.initChart()
+    }
+  },
+  activated() {
+    this.initChart()
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.chart)
+      this.chart.setOption({
+        // tooltip: {
+        //   show: true
+        // }
+        // color: [
+        //   '#19d4ae', '#5ab1ef', '#fa6e86',
+        //   '#ffb980', '#0067a6', '#c4b4e4',
+        //   '#d87a80', '#9cbbff', '#d9d0c7',
+        //   '#87a997', '#d49ea2', '#5b4947',
+        //   '#7ba3a8'
+        // ]
+        // legend: {
+        //   orient: 'vertical',
+        //   right: 0,
+        //   data: this.pieData.map(item => item.name)
+        // }
+        // series: [{
+        //   name: '进出记录',
+        //   type: 'pie',
+        //   data: this.pieData,
+        //   label: {
+        //     show: true
+        //     // formatter: '{b}记录数:{c}条'
+        //   },
+        //   tooltip: {
+        //     // formatter: '{b}<br/>记录数: {d}%,{c}条'
+        //   }
+        // }]
+      })
+      this.chart.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container{
+  text-align: center;
+}
+.chart-body{
+  height: 60vh;
+  width: 80%;
+  margin-right: auto;
+  margin-left: auto;
+}
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..67aa32b
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,242 @@
+<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'
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      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/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..50a07f2
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,191 @@
+<template>
+  <app-container>
+    <!--<div class="statistic-container">-->
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-date-picker
+          v-model="year"
+          type="year"
+          placeholder="请选择统计年份"
+          value-format="yyyy"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="month"
+          type="month"
+          placeholder="请选择统计年月"
+          value-format="yyyy-MM"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData1">
+          <el-option
+            v-for="item in toiletList"
+            :key="item.toiletId"
+            :label="item.name"
+            :value="item.toiletId"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <div class="chart-container">
+      <el-row>
+        <el-col :span="24" class="chart-body" >
+          <div class="chart-body-title">按年/月清洁次数统计</div>
+          <bar-chart ref="chart1"/>
+        </el-col>
+      <!--<el-col :span="12" class="chart-body" >-->
+      <!--<div class="chart-body-select">-->
+      <!--<el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData2">-->
+      <!--<el-option-->
+      <!--v-for="item in toiletList"-->
+      <!--:key="item.toiletId"-->
+      <!--:label="item.name"-->
+      <!--:value="item.toiletId"/>-->
+      <!--</el-select>-->
+      <!--</div>-->
+      <!--<div class="chart-body-title" style="padding-top: 20px">按年/月清洁次数统计</div>-->
+      <!--<bar-chart ref="chart2"/>-->
+      <!--</el-col>-->
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+import { getDayTime } from '@/utils/dateutils'
+import DeptSelect from '@/components/DeptSelect/index'
+import PieChart from './pieChart'
+import BarChart from './barChart'
+
+export default {
+  name: 'WorkStatistics',
+  components: { BarChart, PieChart, DeptSelect },
+  data() {
+    return {
+      year: '',
+      month: '',
+      listQuery: {
+        staticType: 'year',
+        toiletId: '',
+        startTime: '2020-01-01',
+        endTime: '2020-12-30'
+      },
+      toiletList: [{ toiletId: '9461', name: '公厕1' }, { toiletId: '9462', name: '公厕2' }, { toiletId: '9463', name: '公厕3' }], // 显示列
+      list: [], // 列表数据
+      chartList: [],
+      chartList2: [],
+      chartshow: false
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData1()
+    // this.fetchData2()
+  },
+  methods: {
+    // 获取统计数据
+    fetchData1() {
+      this.$refs.chart1.fetchData(this.listQuery)
+    },
+    fetchData2() {
+      this.$refs.chart2.fetchData(this.listQuery)
+    },
+    changeDate(date) {
+      let beginTime, endTime
+
+      if (date === 'today') {
+        beginTime = getDayTime(new Date().getTime())
+        endTime = new Date()
+        this.timeRange = [beginTime, endTime]
+      } else if (date === 'yesterday') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
+        endTime = getDayTime(new Date().getTime())
+      } else if (date === 'sevendays') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+        endTime = new Date()
+      } else if (date === 'lastmonth') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+        endTime = new Date()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      // this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleColor:#fff;
+  .app-container{
+    padding: 5px 10px 10px 10px;
+    .statistic-container{
+      margin: 10px;
+      padding:0px;
+      border: 1px solid #d3dce6;
+      .chart-tools{
+        background-color: #f2f2f2;
+        line-height: 40px;
+        padding-left: 10px;
+        padding-right: 5px;
+        .chart-tool-text{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button:hover{
+          background-color: #8cc5ff;
+          cursor: pointer;
+          color:white
+        }
+        .chart-tool-button:active{
+          background-color: #8cc5ff;
+          color:white
+        }
+        .editor--datetimerange.el-input__inner{
+          width: 300px;
+        }
+      }
+      .chart-title{
+        margin: auto;
+        text-align: center;
+        margin-top: 15px;
+      }
+    }
+    .chart-body{
+      padding:15px;
+      .chart-body-title {
+        font-size:22px;
+        text-align: center;
+        background-color: white;
+        padding-top: 20px;
+      }
+      .chart-body-select{
+        margin-top:20px;
+        text-align: center;
+        .select-label{
+          font-size: 15px;
+          color: #606266;
+          line-height: 40px;
+          font-weight:500;
+          padding: 0 6px 0 0
+        }
+      }
+    }
+  }
+  .chart-container{
+    background-color: $tableTitleColor !important;
+    border-top: 12px solid #ebebeb !important;
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..247c03d
--- /dev/null
+++ b/src/views/toilet/components/detail.vue
@@ -0,0 +1,431 @@
+<template>
+  <div class="info-block">
+    <div class="block-body">
+      <el-row class="body-right">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥梁名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.name }}</span>
+              <!--<div class="item-value-middle"><el-input v-model="bridgeForm.name" :disabled="disabled"/></div>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥型：</span>
+              <span class="item-value-middle">{{ bridgeForm.typeName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.typeName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">柱号：</span>
+              <span class="item-value-middle">{{ bridgeForm.bridgeCode }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">道路名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.roadName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.roadName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">高度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.height }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">长度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.length }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">开建时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.buildTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">通车时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.openTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁图片：</span>
+              <span v-show="photo===''" class="item-value-middle">无</span>
+              <el-image
+                v-if="photo!==''"
+                :src="photo!==''?photo:null"
+                fit="cover"
+                style="width: 430px; height: 275px; margin-top:20px; margin-left: 10px;vertical-align: top;"/>
+              <el-upload
+                ref="upload"
+                :before-upload="handleBeforeUpload"
+                :http-request="uploadPhoto"
+                :show-file-list="false"
+                style="display: inline-block;vertical-align: top;"
+                action="string"
+                accept=".jpg,.jpeg,.png">
+                <el-button v-show="isEditMode" class="edit_btn" type="primary" size="small" style="vertical-align: bottom;" @click="uploadPhoto">上传桥梁图片</el-button>
+              </el-upload>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title">桥梁位置：</span>
+              <span class="item-value-middle">{{ bridgeForm.position }}</span>
+              <el-button class="edit_btn" size="small" @click="checkMap">查看地图</el-button>
+              <div v-if="showMap" style="height: 480px; width: 800px; margin-left: 130px" id="map" keep-alive/>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁简介：</span>
+              <span v-show="!isEditMode" class="item-value-long">{{ bridgeForm.description }}</span>
+              <span v-show="isEditMode" class="item-value-long" ><el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" show-word-limit/></span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row v-show="isEditMode" style="margin-top: 30px;text-align: center">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="cancel">取消</el-button>
+        </el-row>
+      </el-row>
+    </div>
+    <div class="clearfloat"/>
+  </div>
+</template>
+<script>
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
+import L from 'leaflet'
+
+export default {
+  name: 'Detail',
+  data() {
+    return {
+      showMap: false,
+      isEditMode: false,
+      bridgeList: [
+        {id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450},
+        {id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659},
+        {id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659}
+      ],
+      map: null,
+      baselayer: [],
+      icon: 'static/images/well/0100.png',
+      photo: '',
+      bridgeForm: {
+        id: '',
+        name: '',
+        type: '',
+        typeName: '',
+        bridgeCode: '',
+        roadName: '',
+        height: '',
+        length: '',
+        buildTime: '',
+        openTime: '',
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: ''
+      },
+      // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
+      // token: '?token=' + this.$store.getters.token, // token,
+      disabled: true,
+      defaultPhoto: '' // require('../../../assets/global_images/photo.jpg') // 默认图片路径
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    fetchData(bridgeId) {
+      getDetail(bridgeId).then(response => {
+        this.bridgeForm = response.data
+        this.photo = this.bridgeForm.photo
+        this.listLoading = false
+      })
+    },
+    checkMap() {
+      this.initMap()
+      this.initMap()
+    },
+    initMap() {
+      debugger
+      this.showMap = true
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 18,
+        center: [27.763248, 116.043450],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.invalidateSize(true)
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      var Icon = L.icon({
+        iconUrl: require('../../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+      if(this.bridgeForm.name === '永胜桥') {
+        this.map.setView({ lat: 27.763248, lng: 116.043450 }, 16)
+        L.marker([27.763248, 116.043450], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '黄洲桥') {
+        this.map.setView({ lat: 27.760096, lng: 116.053659 }, 16)
+        L.marker([27.760096, 116.053659], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '光明桥') {
+        this.map.setView({ lat: 27.767046, lng: 116.058659 }, 16)
+        L.marker([27.767046, 116.058659], {
+          icon: Icon
+        }).addTo(this.map)
+      }
+    },
+    showUploadBut() {
+      this.isEditMode = true
+    },
+    saveData() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        let index = this.photo.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        this.bridgeForm.photo = this.photo.substring(index)
+      }
+      updateBridge(this.bridgeForm).then(res => {
+        if (res.code === 200) {
+          this.$message.success('编辑成功')
+        }
+      })
+      this.isEditMode = false
+    },
+    // 图片上传
+    uploadPhoto(file) {
+      // console.log('uploadFile:' + file.file.name)
+      // const base_url = process.env.BASE_API + '/static/'
+
+      // 转base64
+      this.getBase64(file.file).then(resBase64 => {
+        this.photo = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
+        console.log(this.photo)
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      console.log(file.size)
+      const isLt2M = file.size / 1024 < 200
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 200KB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      debugger
+      const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        this.photo = base_url + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    getBase64(file) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        let fileResult = ''
+        reader.readAsDataURL(file)
+        // 开始转
+        reader.onload = function() {
+          fileResult = reader.result
+        }
+        // 转 失败
+        reader.onerror = function(error) {
+          reject(error)
+        }
+        // 转 结束  咱就 resolve 出去
+        reader.onloadend = function() {
+          resolve(fileResult)
+        }
+      })
+    },
+    cancel() {
+      this.isEditMode = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $left-width: 160px;
+  .info-block{
+    /*overflow-y: scroll;*/
+    /*white-space: nowrap;*/
+    margin: 10px 20px;
+    padding-bottom: 120px;
+    /*overflow: ;*/
+    .block-title-div{
+      font-size: 17px;
+      color: #1f2d3d;
+      font-weight: bold;
+      /*border-bottom: 1px solid #d3dce6;*/
+      .block-title{
+        padding-left: 10px;
+        margin-bottom: 10px;
+        /*border-left: 5px solid #004493;*/
+      }
+    }
+    .block-body{
+      margin-top: 20px;
+      margin-left: 50px;
+      .body-left{
+        width: $left-width;
+        /*float: left;*/
+      }
+      .body-right{
+        width: calc( 100% - 160px );
+        float: left;
+        .item-div{
+          line-height: 55px;
+          font-size:17px;
+          .item-title{
+            text-align: right;
+            width:120px;
+            color: #909090;
+            font-weight: bold;
+            display: inline-block;
+          }
+          .item-value-middle{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 280px !important;
+            display: inline-block;
+          }
+          .item-value-long{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 680px !important;
+            display: inline-block;
+          }
+        }
+      }
+    }
+    .person-photo{
+      width: 106px;
+      height: 150px;
+      padding: 1px;
+      border: 1px solid #92dfff;
+    }
+
+  }
+  avatar-uploader .el-upload {
+    margin-left: 12px;
+    margin-top: 10px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  // 地图
+  .overview-map-container{
+    width: 100%;
+    padding: 5px;
+    .map-demo{
+      width: 100%;
+      height: calc(100vh - 78px);
+      .svg-icon{
+        width: 20px;
+        height: 20px;
+      }
+      .alarm-icon{
+        width:30px;
+        height: 30px;
+      }
+      .nomal-info-window{
+        background-color: pink;
+      }
+      .info-window{
+        max-width: 250px;
+        /*background-color: lightcyan;*/
+        .info-header{
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          font-weight: bold;
+          /*background-color: #eaf4ff;*/
+        }
+        .info-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+        }
+      }
+      .alarm-window{
+        max-width: 250px;
+        /*background-color: #ffeaf1;*/
+        .alarm-header {
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          color: red;
+          font-weight: bold;
+          /*background-color: #ffecec;*/
+        }
+        .alarm-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+          .alarm-red{
+            color: #ff0000;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
new file mode 100644
index 0000000..000deea
--- /dev/null
+++ b/src/views/toilet/components/editToilet.vue
@@ -0,0 +1,368 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="toiletForm" label-position="right" label-width="130px">
+      <div class="form-div">
+        <div class="form-left">
+          <el-row :gutter="20">
+            <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="20">
+            <el-col :span="12">
+              <el-form-item label="占地面积" prop="area">
+                <el-input v-model.trim="toiletForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+              </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="20">
+            <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="20">
+            <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="20">
+            <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"
+                  style="width: 100%"
+                  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 slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @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/',
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      photo: '', // 图片路径
+      defaultPhoto: require('../../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      toiletForm: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      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'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        debugger
+        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: '' // 备注
+      }
+      this.photo = ''
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      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()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      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
+            }
+          })
+        }
+      })
+    },
+    // 打开地图选点
+    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)
+    },
+    // 图片上传
+    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)
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    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/toilet/listToilet.vue b/src/views/toilet/listToilet.vue
new file mode 100644
index 0000000..2c5209e
--- /dev/null
+++ b/src/views/toilet/listToilet.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" 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.owner" size="small" placeholder="建设单位" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.position" size="small" placeholder="位置" clearable/>
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-toilet v-show="editShow" ref="edittoilet" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getToiletList, delToilet } from '@/api/sanitation/toilet'
+import EditToilet from './components/editToilet'
+
+export default {
+  name: 'ListToilet',
+  components: { EditToilet },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字（编号、名称）
+        owner: '', // 建设单位
+        position: '', // 道路
+        offset: 1,
+        limit: 20,
+        sort: 'ts',
+        order: 'desc'
+      }, // 筛选条件
+      timeRange: [],
+      columns: [
+        {
+          text: '公厕编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '公厕名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '建设单位',
+          value: 'owner',
+          align: 'center'
+        },
+        {
+          text: '建设时间',
+          value: 'ts',
+          align: 'center'
+        },
+        {
+          text: '街道',
+          value: 'position',
+          align: 'center'
+        },
+        {
+          text: '占地面积',
+          value: 'area',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'responsiblePerson',
+          align: 'center'
+        },
+        {
+          text: '责任人电话',
+          value: 'responsiblePersonTel',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  mounted() {
+    this.fetchData(false)// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getToiletList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('update', true, row)
+    },
+    // 删除单个公厕
+    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()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '识别记录列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/listWork.vue b/src/views/toilet/listWork.vue
new file mode 100644
index 0000000..9281717
--- /dev/null
+++ b/src/views/toilet/listWork.vue
@@ -0,0 +1,206 @@
+<template>
+  <app-container>
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @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="datetimerange"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
+      <template slot="btns">
+        <el-button 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 NormalTable from '@/components/NormalTable'
+import AppContainer from '@/components/layout/AppContainer'
+import SearchArea from '@/components/SearchArea/SearchArea'
+import SearchItem from '@/components/SearchArea/SearchItem'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
+export default {
+  name: 'ListWork',
+  components: { SearchItem, SearchArea, AppContainer, NormalTable },
+  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'
+        }
+      ], // 显示列
+      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
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
+    },
+    // 点击详情
+    goDetail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    // 批量导出
+    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: '', // 关键字
+        type: '', // 公厕类型
+        post: '', // 岗位
+        ts: '', // 入职年月时间
+        jobCode: '', // 作业内容
+        responseArea: '', // 负责片区
+        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/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
new file mode 100644
index 0000000..9ed5b84
--- /dev/null
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -0,0 +1,210 @@
+<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'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+
+export default {
+  name: 'ToiletCleanList',
+  data() {
+    return {
+      dateRange: [getLastWeek('yyyy-MM-dd hh:mm:ss'), getToday('yyyy-MM-dd hh:mm:ss')], // 日期范围
+      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.dateRange = [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')]
+    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 && 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..1323d1e
--- /dev/null
+++ b/src/views/toiletManage/editToilet.vue
@@ -0,0 +1,407 @@
+<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="占地面积(m²)" 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..0860556
--- /dev/null
+++ b/src/views/toiletManage/toiletList.vue
@@ -0,0 +1,285 @@
+<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: '占地面积(m²)',
+          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/config/index.js b/config/index.js
index 8abd37a..19b33b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    assetsPublicPath: '/toilet/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 45f055f..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",
@@ -33,7 +34,9 @@
     "vue-amap": "^0.5.9",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "3.0.1",
-    "vuex": "3.0.1"
+    "vue2-leaflet": "^2.7.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.17.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/api/common.js b/src/api/common.js
index 87c582b..7804714 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,10 +2,14 @@
  * 常用接口
  */
 import request from '@/utils/request'
+import Vue from 'vue'
+
 // 模板下载
 export function downloadTemplate(fileName) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
   return request({
-    url: 'template/download',
+    url: lampPath + 'template/download',
     method: 'get',
     params: {
       filename: fileName
@@ -19,7 +23,7 @@
   const param = new FormData()
   param.append('file', fileobj.file)
   return request({
-    url: 'imageUpload',
+    url: 'fileUpload',
     method: 'post',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: param
diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
new file mode 100644
index 0000000..ffeac18
--- /dev/null
+++ b/src/api/sanitation/statistics.js
@@ -0,0 +1,22 @@
+
+/**
+ * 考核统计接口
+ */
+import request from '@/utils/request'
+// 公厕保洁次数统计
+export function getToiletJobCount(params) {
+  return request({
+    url: '/sanitation/statistic/toilet/jobCount',
+    method: 'get',
+    params
+  })
+}
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
new file mode 100644
index 0000000..11affd4
--- /dev/null
+++ b/src/api/sanitation/toilet.js
@@ -0,0 +1,133 @@
+/**
+ * 公厕管理接口
+ */
+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 getToiletInfoDetail(id) {
+  return request({
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
+  })
+}
+
+// 某公厕保洁记录
+export function getRecordsByToilet(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕平均评分
+export function getScoreByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/detailScore',
+    method: 'get',
+    params
+  })
+}
+
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量导入
+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/alarm.js b/src/api/system/alarm.js
new file mode 100644
index 0000000..1c3a7ab
--- /dev/null
+++ b/src/api/system/alarm.js
@@ -0,0 +1,62 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getAlarmNowList(params) {
+  return request({
+    url: '/alarm/listNowPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getAlarmHistoryList(params) {
+  return request({
+    url: '/alarm/listHisPage',
+    method: 'get',
+    params
+  })
+}
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js
new file mode 100644
index 0000000..e8a4108
--- /dev/null
+++ b/src/api/system/bridge.js
@@ -0,0 +1,80 @@
+/**
+ * 桥梁管理接口
+ */
+import request from '@/utils/request'
+
+// 获取桥梁详情
+export function getDetail(id) {
+  return request({
+    url: '/bridge/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateBridge(params) {
+  return request({
+    url: '/bridge/update',
+    method: 'post',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/data.js b/src/api/system/data.js
new file mode 100644
index 0000000..4c95db5
--- /dev/null
+++ b/src/api/system/data.js
@@ -0,0 +1,63 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取当前报警列表
+export function getHistoryList(params) {
+  return request({
+    url: '/data/hisListPage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取当前报警列表
+export function getHistory(params) {
+  return request({
+    url: '/data/hisList',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 批量消警
+export function clearAll(params) {
+  return request({
+    url: '/alarm/allClear',
+    method: 'get',
+    params
+  })
+}
+
+// 消警
+export function clearAlarm(params) {
+  return request({
+    url: '/alarm/cancel',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 设置报警阈值
+export function setThresh(params) {
+  return request({
+    url: '/alarm/resetAlarmRule',
+    method: 'post',
+    params
+  })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
new file mode 100644
index 0000000..7007c50
--- /dev/null
+++ b/src/api/system/order.js
@@ -0,0 +1,71 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRecordList(params) {
+  return request({
+    url: '/maintain/listPage',
+    method: 'get',
+    params
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      bridgeMaintenanceId: id
+    }
+  })
+}
diff --git a/src/api/system/overview.js b/src/api/system/overview.js
new file mode 100644
index 0000000..bca50cc
--- /dev/null
+++ b/src/api/system/overview.js
@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+import qs from "qs"
+import Vue from 'vue'
+
+// 路灯状态统计
+export function getLampStatus() {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampStatus',
+    method: 'get'
+  })
+}
+
+//  路灯总览列表
+export function getLampList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampList',
+    method: 'get',
+    params
+  })
+}
+
+// 路灯详情
+export function getlampDetail(lampId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampDetail',
+    method: 'get',
+    params: {
+      lampId: lampId
+    }
+  })
+}
+
+// 回路列表
+export function getCircuitList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/circuitList',
+    method: 'get',
+    params
+  })
+}
+
+// 灯箱列表
+export function getLampBoxList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxList',
+    method: 'get',
+    params
+  })
+}
+// 灯箱详情
+export function getLampBoxDetail(lampBoxId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampBoxDetail',
+    method: 'get',
+    params: {
+      lampBoxId: lampBoxId
+    }
+  })
+}
+
+// 报警总览列表
+export function getAlarmList(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmList',
+    method: 'get',
+    params
+  })
+}
+
+// 报警详情
+export function getAlarmDetail(alarmId) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/alarmDetail',
+    method: 'get',
+    params: {
+      alarmId: alarmId
+    }
+  })
+}
+
+// 路灯控制
+export function lampControl(params) {
+  const basetConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
+  const lampPath = basetConfig.lampBasePath
+  return request({
+    url: lampPath + 'overview/lampControl',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/system/rule.js b/src/api/system/rule.js
new file mode 100644
index 0000000..76c6b2d
--- /dev/null
+++ b/src/api/system/rule.js
@@ -0,0 +1,59 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 获取当前报警列表
+export function getRuleList() {
+  return request({
+    url: 'rule/listPage',
+    method: 'get'
+  })
+}
+export function getContentList(params) {
+  return request({
+    url: 'maintain/contentByType',
+    method: 'get',
+    params: {
+      type: params
+    }
+  })
+}
+// 批量导出报警
+export function batchExportAlarm(params) {
+  return request({
+    url: 'person/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 编辑
+export function editRecord(params) {
+  return request({
+    url: 'maintain/update',
+    method: 'post',
+    params
+  })
+}
+// 新增
+export function addRecord(params) {
+  return request({
+    url: 'maintain/add',
+    method: 'post',
+    params
+  })
+}
+// 删除
+export function delRecord(id) {
+  return request({
+    url: 'maintain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
new file mode 100644
index 0000000..b25efe9
--- /dev/null
+++ b/src/api/system/statistics.js
@@ -0,0 +1,23 @@
+/**
+ * 人员管理接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+//
+export function countByToilet(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/assets/global_images/icon-position.png b/src/assets/global_images/icon-position.png
new file mode 100644
index 0000000..7444038
--- /dev/null
+++ b/src/assets/global_images/icon-position.png
Binary files differ
diff --git a/src/assets/global_images/location_green.png b/src/assets/global_images/location_green.png
new file mode 100644
index 0000000..aa8be65
--- /dev/null
+++ b/src/assets/global_images/location_green.png
Binary files differ
diff --git a/src/assets/global_images/location_red.png b/src/assets/global_images/location_red.png
new file mode 100644
index 0000000..2be8c3d
--- /dev/null
+++ b/src/assets/global_images/location_red.png
Binary files differ
diff --git a/src/assets/global_images/location_yellow.png b/src/assets/global_images/location_yellow.png
new file mode 100644
index 0000000..5ab6f4d
--- /dev/null
+++ b/src/assets/global_images/location_yellow.png
Binary files differ
diff --git a/src/assets/global_images/toilet-position.png b/src/assets/global_images/toilet-position.png
new file mode 100644
index 0000000..7db6d9a
--- /dev/null
+++ b/src/assets/global_images/toilet-position.png
Binary files differ
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/assets/global_images/toiletPhoto.png b/src/assets/global_images/toiletPhoto.png
new file mode 100644
index 0000000..15d08e2
--- /dev/null
+++ b/src/assets/global_images/toiletPhoto.png
Binary files differ
diff --git a/src/components/DownloadTemplate/index.vue b/src/components/DownloadTemplate/index.vue
index 8ded2cd..7807cac 100644
--- a/src/components/DownloadTemplate/index.vue
+++ b/src/components/DownloadTemplate/index.vue
@@ -47,8 +47,8 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .edit_btn{
-    float:right;
-    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-  }
+  /*.edit_btn{*/
+    /*float:right;*/
+    /*margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2*/
+  /*}*/
 </style>
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..b753cc0
--- /dev/null
+++ b/src/components/mapWindow/leafletMap.vue
@@ -0,0 +1,143 @@
+<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',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
+  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 { minZoom, maxZoom } = this
+      const map = L.map(this.$refs.mapDiv, {
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        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/icons/svg/bridge.svg b/src/icons/svg/bridge.svg
new file mode 100644
index 0000000..1a0336f
--- /dev/null
+++ b/src/icons/svg/bridge.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1616385022329" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2175" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M987.453793 211.862069 36.581517 211.862069C16.384 211.862069 0 227.645793 0 247.172414l0 494.344828c0 19.526621 16.384 35.310345 36.581517 35.310345 20.197517 0 36.581517-15.783724 36.581517-35.310345L73.163034 282.482759l877.709241 0 0 459.034483c0 19.526621 16.384 35.310345 36.581517 35.310345C1007.616 776.827586 1024 761.043862 1024 741.517241L1024 247.172414C1024 227.645793 1007.616 211.862069 987.453793 211.862069zM512 459.034483c-181.777655 0-329.127724 142.265379-329.127724 317.793103L256 776.827586c0-136.509793 114.617379-247.172414 256-247.172414s256 110.662621 256 247.172414l73.127724 0C841.127724 601.299862 693.777655 459.034483 512 459.034483z" p-id="2176"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/toilet.svg b/src/icons/svg/toilet.svg
new file mode 100644
index 0000000..9d8e765
--- /dev/null
+++ b/src/icons/svg/toilet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1614242031159" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1169" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M242.757415 253.053487c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.933851-119.58769-118.225421-119.587689s-118.225421 53.51768-118.225422 119.587689c0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c35.127059 0 63.734692 29.191462 63.734692 65.09696 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696zM390.563518 292.85118H94.951312c-51.085059 0-59.064058 48.847047-59.064058 59.745192v344.653863c0 21.115158 88.547435 27.926499 88.547435 57.409875v235.672404c0 10.995451 8.854743 19.947499 19.655584 19.947499h197.042369c10.898146 0 19.655584-8.952048 19.655584-19.947499V750.767915c0-31.429474 88.83935-31.429474 88.83935-53.51768V352.693677c0-10.995451-2.627232-59.842497-59.064058-59.842497z m4.573329 373.748019c-31.332169 9.243963-88.83935 26.56423-88.83935 84.168716v205.021369H178.925418V754.66011c0-54.296119-53.809595-73.562484-85.920204-85.141764-0.875744-0.291915-1.751488-0.583829-2.627231-0.973049V353.861336c0.291915-2.043402 1.264963-4.865244 2.140707-6.324817 0.486524-0.097305 1.362268-0.19461 2.432622-0.19461H390.563518c1.751488 0 3.016451 0.097305 3.9895 0.19461 0.291915 1.362268 0.583829 3.308366 0.583829 5.157158v313.905522z m334.82607-413.545712c65.29157 0 118.225421-53.51768 118.225421-119.58769 0-66.070009-52.836546-119.58769-118.225421-119.587689-65.29157 0-118.225421 53.51768-118.225422 119.587689 0 66.070009 52.933851 119.58769 118.225422 119.58769z m0-184.68465c16.931048 0 32.889047 6.714036 44.857546 18.877145 12.163109 12.260414 18.877145 28.704938 18.877146 46.219815 0 35.905498-28.607633 65.09696-63.734692 65.096961s-63.734692-29.191462-63.734692-65.096961c0-35.905498 28.607633-65.09696 63.734692-65.09696z m256.398342 695.924455L845.561107 374.781884c-15.957999-48.944351-61.107461-81.930704-111.99791-81.930704H726.751856c-50.793144 0-96.03991 32.889047-111.99791 81.930704l-141.092066 389.511408c-4.670634 13.038853 4.767939 26.75884 18.487926 26.758841h129.415482c10.898146 0 19.655584 8.952048 19.655584 19.947499v179.332882c0 10.995451 8.854743 19.947499 19.752889 19.947499h137.881006c10.898146 0 19.752889-8.952048 19.75289-19.947499V810.999632c0-10.995451 8.854743-19.947499 19.655584-19.947499h129.415482c13.817292 0 23.35317-13.719987 18.682536-26.758841z m-148.098018-27.731888c-40.868047 0-74.146314 33.375572-74.146314 74.438228v144.789652h-68.405326V810.999632c0-41.062657-33.278267-74.438228-74.146313-74.438228h-79.887302L665.93631 393.367114c0.19461-0.583829 0.389219-1.167658 0.583829-1.654182 8.660134-26.466926 32.791742-44.273717 60.231717-44.273718h6.811341c27.342669 0 51.571583 17.806792 60.231717 44.371022 0.19461 0.583829 0.389219 1.070354 0.583829 1.654183l124.063714 343.291594h-80.179216v-0.194609z m0 0" p-id="1170" fill="#515151"></path></svg>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f2d105d..3e4074e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@
 // echart
 // import echarts from 'echarts'
 // Vue.prototype.$echarts = echarts
+// 引入v-charts
+import VCharts from 'v-charts'
+Vue.use(VCharts)
 
 // 将自动注册所有组件为全局组件
 // import dataV from '@jiaminghi/data-view'
@@ -35,9 +38,19 @@
 Vue.component('search-item', SearchItem)
 
 // 加载leaflet的css
+// import 'leaflet/dist/leaflet.css'
+// import 'leaflet-draw/dist/leaflet.draw.css'
+import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import 'leaflet-draw/dist/leaflet.draw.css'
+Vue.config.productionTip = false
+Vue.L = Vue.prototype.$L = L
 
+delete L.Icon.Default.prototype._getIconUrl
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
+  iconUrl: require('leaflet/dist/images/marker-icon.png'),
+  shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+})
 /**
  * This project originally used easy-mock to simulate data,
  * but its official service is very unstable,
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 39c295c..d23076d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,11 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
+import { toiletRouters } from './modules/toilet'
+import { workRouters } from './modules/work'
+import { statisticsRouters } from './modules/statistics'
+import { ruleRouters } from './modules/rule'
 import { systemRouters } from './modules/system'
-import { exampleRouters } from './modules/example'
 
 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
@@ -40,11 +43,12 @@
     ]
   },
   // 登录页面
-  { 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 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
+  { path: '/', redirect: '/toiletList', hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -56,7 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...exampleRouters,
-  ...systemRouters,
+  ...toiletRouters,
+  ...workRouters,
+  ...statisticsRouters,
+  ...ruleRouters,
+  // ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/rule.js b/src/router/modules/rule.js
new file mode 100644
index 0000000..51e0283
--- /dev/null
+++ b/src/router/modules/rule.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const ruleRouters = [
+  {
+    path: 'rule',
+    component: Layout,
+    redirect: '/rule',
+    name: 'Rule',
+    meta: {
+      title: '规章制度',
+      icon: 'icon-config', // 图标
+      permission: ['/rule']// 权限名称
+    },
+    children: [
+      {
+        path: '/rule',
+        name: 'Rule',
+        component: () => import('@/views/rule/listRule'),
+        meta: { title: '规章制度', icon: 'function', permission: ['/rule'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js
new file mode 100644
index 0000000..fb9cbea
--- /dev/null
+++ b/src/router/modules/statistics.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const statisticsRouters = [
+  {
+    path: 'statisticsToilet',
+    component: Layout,
+    redirect: '/workStatistics',
+    name: 'StatisticsToilet',
+    meta: {
+      title: '作业统计',
+      icon: 'icon-config', // 图标
+      permission: ['/statisticsToilet']// 权限名称
+    },
+    children: [
+      {
+        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
new file mode 100644
index 0000000..b221a0e
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const toiletRouters = [
+  {
+    path: 'toiletManage',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'ToiletManage',
+    meta: {
+      title: '公厕管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletManage']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletList',
+        name: 'ToiletList',
+        component: () => import('@/views/toiletManage/toiletList'),
+        meta: { title: '公厕台帐管理', icon: 'function', permission: ['/toiletList'] }
+      },
+      {
+        path: '/toiletMap',
+        name: 'ToiletMap',
+        component: () => import('@/views/overview/overview'),
+        meta: { title: '地图总览', icon: 'function', permission: ['/toiletMap'] }
+      }
+    ]
+  }
+]
diff --git a/src/router/modules/work.js b/src/router/modules/work.js
new file mode 100644
index 0000000..5e0759f
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '@/layout/Layout'
+
+export const workRouters = [
+  {
+    path: 'toiletWork',
+    component: Layout,
+    redirect: '/toiletManage',
+    name: 'toiletWork',
+    meta: {
+      title: '作业管理',
+      icon: 'icon-config', // 图标
+      permission: ['/toiletWork']// 权限名称
+    },
+    children: [
+      {
+        path: '/toiletWork',
+        name: 'ToiletWork',
+        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/baseConfig.js b/src/utils/baseConfig.js
index 1f4fa38..999593e 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '后台管理系统前端基础框架'
+  title: '路桥养护子系统'
 }
 export function getProject() {
   return project
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/utils/request.js b/src/utils/request.js
index c88ea76..dc56e26 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,6 +17,13 @@
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       console.log(config.headers['token'])
     }
+    // 在接口增加时间戳
+    // if (config.method === 'get') {
+    config.params = {
+      _t: Date.parse(new Date()) / 1000,
+      ...config.params
+    }
+    // }
     return config
   },
   error => {
diff --git a/src/views/mapViews/choosePointDialog.vue b/src/views/mapViews/choosePointDialog.vue
new file mode 100644
index 0000000..c9dde8a
--- /dev/null
+++ b/src/views/mapViews/choosePointDialog.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :title="type=='edit'?'地图选点':'位置查看'" width="50%" append-to-body>
+    <div class="form-div">
+      <div class="form-left" style="height:300px;">
+        <map-view ref="map" @click="click">
+          <l-marker v-if="marker!=null" :lat-lng="marker" :icon="iconOptions"/>
+        </map-view>
+      </div>
+    </div>
+    <div v-show="type=='edit'" slot="footer" class="dialog-footer">
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import MapView from './mapView'
+import { LMarker, LPopup } from 'vue2-leaflet'
+import { icon } from 'leaflet'
+import * as L from 'leaflet'
+export default {
+  name: 'ChoosePointDialog',
+  components: { MapView, LMarker, LPopup },
+  data() {
+    return {
+      type: 'readonly', // 弹窗类型，readonly只读， edit编辑
+      map: null, // map对象
+      center: this.baseConfig.center, // 地图中心
+      dialogFormVisible: false, // 对话框是否显示
+      canEdit: true, // 保存按钮是否可以点击
+      marker: null, // 图标坐标点，LatLng格式
+      iconOptions: icon({
+        iconUrl: require('../../assets/global_images/icon-position.png'), // 图片路径
+        iconSize: [32], // 图片大小
+        iconAnchor: [16, 32] // 偏移x,y，针对图片的左上角
+      }) // 图标配置
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图点击事件
+    click(e) {
+      if (this.type === 'edit') {
+        console.log('onclick', e.latlng)
+        this.marker = e.latlng
+      }
+    },
+    /**
+     * 初始化对话框
+     * @param type 弹窗类型只读还是选点
+     * @param position 默认位置
+     */
+    initDialog: function(type, position) {
+      this.type = type
+      this.dialogFormVisible = true
+      if (position) {
+        const lat = parseFloat(position.lat)
+        const lng = parseFloat(position.lng)
+        this.marker = L.latLng(lat, lng)
+        this.center = L.latLng(lat, lng)
+      } else {
+        this.marker = null
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.marker) {
+        this.$emit('choose', this.marker)
+        this.dialogFormVisible = false
+      } else {
+        this.$message.info('尚未选点')
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .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/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
new file mode 100644
index 0000000..a18db88
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,73 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <l-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
+      <l-tile-layer :url="mapurl"/>
+      <l-tile-layer :url="labelurl"/>
+      <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
+      <slot/>
+    </l-map>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { LMap, LTileLayer, LMarker, LPopup } from 'vue2-leaflet'
+export default {
+  name: 'MapView',
+  components: { LMap, LTileLayer, LMarker, LPopup },
+  props: {
+    center: {
+      type: Array,
+      default: () => {
+        return [27.75962, 116.06021]
+      }
+    }
+  },
+  data() {
+    return {
+      map: null,
+      zoom: this.baseConfig.zoom,
+      maxZoom: 21,
+      minZoom: 10,
+      currentCrs: '3857',
+      crsList: {
+        '3857': {
+          crs: L.CRS.EPSG3857,
+          zoomOffset: 0
+        },
+        '4326': {
+          crs: L.CRS.EPSG4326,
+          zoomOffset: 1
+        }
+      },
+      mapurl: this.baseConfig.mapUrl,
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  mounted() {
+    // const that = this
+    // this.$nextTick(() => {
+    //   that.map = this.$refs.map.mapObject
+    //   that.map.on('click', function(e) {
+    //     that.$emit('click', e)
+    //   })
+    // })
+  },
+  methods: {
+    onReady() {
+      console.log('mapView.onReady')
+      const that = this
+      this.map = this.$refs.map.mapObject
+      this.map.on('click', function(e) {
+        that.$emit('click', e)
+      })
+      this.$emit('ready')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/order/editOrder.vue b/src/views/order/editOrder.vue
new file mode 100644
index 0000000..4a5fd8a
--- /dev/null
+++ b/src/views/order/editOrder.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="orderForm" size="small" label-position="right" label-width="130px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护编号" prop="code">
+            <el-input v-model.trim="orderForm.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="orderForm.name" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属类别" prop="category">
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="桥梁">桥梁养护</el-radio>
+            <el-radio v-model="orderForm.category" :disabled="isDetailMode" label="道路">道路养护</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="orderForm.category === '桥梁'" label="所属桥梁" prop="bridgeId">
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="1">永胜桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="2">黄洲桥</el-radio>
+            <el-radio v-model="orderForm.bridgeId" :disabled="isDetailMode" label="3">光明桥</el-radio>
+          </el-form-item>
+          <el-form-item v-if="orderForm.category === '道路'" label="所属道路" prop="roadId">
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="1">备选项</el-radio>
+            <el-radio v-model="orderForm.roadId" :disabled="isDetailMode" label="2">备选项</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="养护类型" prop="type">
+            <el-select v-model="orderForm.type" :disabled="isDetailMode" placeholder="请选择" @change="selectType">
+              <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="status">
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="1">未启动</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="2">进行中</el-radio>
+            <el-radio v-model="orderForm.status" :disabled="isDetailMode" label="3">已完成</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人" prop="personId">
+            <el-select v-model="orderForm.personId" :disabled="isDetailMode" placeholder="请选择">
+              <el-option
+                v-for="item in personList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="养护日期" prop="maintainTimeStr">
+            <el-date-picker
+              v-model="orderForm.maintainTimeStr"
+              :disabled="isDetailMode"
+              size="small"
+              type="date"
+              style="width: 290px"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始养护日期"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司" prop="tenderCompany">
+            <el-input v-model.trim="orderForm.tenderCompany" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承建公司责任人" prop="tender">
+            <el-input v-model.trim="orderForm.tender" :disabled="isDetailMode" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="承建公司联系电话" prop="phone">
+            <el-input v-model.trim="orderForm.phone" :disabled="isDetailMode" maxlength="11" type="text" placeholder="必填" show-word-limit />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="养护内容" prop="content">
+            <el-input v-model.trim="orderForm.content" aria-multiline="true" disabled type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="description">
+            <el-input v-model.trim="orderForm.description" :disabled="isDetailMode" aria-multiline="true" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @click="cancel">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRecord, editRecord, getContentList, getPersons } from '@/api/system/order'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'EditOrder',
+  components: { DeptSelect, SelectTree },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      orderForm: {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTimeStr: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }, // 表单
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      personList: [],
+      contentList: [],
+      multiData: false, // 组织树是否为多级列表
+      deptTreeList: [], // 组织树列表数据
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        code: [{ required: true, message: '养护编号不能为空', trigger: ['blur', 'change'] }],
+        category: [{ required: true, message: '所属类别必选', trigger: ['blur', 'change'] }],
+        type: [{ required: true, message: '养护类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '养护名称不能为空' }],
+        status: [{ required: true, message: '养护状态必选', trigger: ['blur', 'change'] }],
+        bridgeId: [{ required: true, message: '所属桥梁必选', trigger: ['blur', 'change'] }],
+        roadId: [{ required: true, message: '所属道路必选', trigger: ['blur', 'change'] }],
+        personId: [{ required: true, message: '责任人必选', trigger: ['blur', 'change'] }],
+        maintainTimeStr: [{ required: true, message: '养护日期必选', trigger: ['blur', 'change'] }],
+        content: [{ required: true, message: '养护内容必选', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.isDetailMode = false
+      if (row !== null) { // 将row中数据填写到输入框中
+        this.orderForm = {
+          id: row.id,
+          code: row.code,
+          category: row.category,
+          type: row.type,
+          name: row.name,
+          status: row.status,
+          bridgeId: row.bridgeId,
+          roadId: row.roadId,
+          personId: row.personId,
+          maintainTime: row.maintainTime,
+          maintainTimeStr: row.maintainTimeStr,
+          content: row.content,
+          tenderCompany: row.tenderCompany,
+          tender: row.tender,
+          phone: row.phone,
+          description: row.description
+        }
+      }
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+      }
+      this.selectType()
+      this.fetchPersons()
+      debugger
+    },
+    selectType() {
+      getContentList(this.orderForm.type).then(response => {
+        this.orderForm.content = response.data
+      })
+    },
+    fetchPersons() {
+      getPersons().then(response => {
+        this.personList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.orderForm = {
+        id: '',
+        code: '',
+        category: '',
+        type: '',
+        name: '',
+        status: '',
+        bridgeId: '',
+        roadId: '',
+        personId: '',
+        maintainTime: '',
+        content: '',
+        tenderCompany: '',
+        tender: '',
+        phone: '',
+        description: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.orderForm)
+        if (valid) {
+          addRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          editRecord(this.orderForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/order/listMaintainRecords.vue b/src/views/order/listMaintainRecords.vue
new file mode 100644
index 0000000..2d4f682
--- /dev/null
+++ b/src/views/order/listMaintainRecords.vue
@@ -0,0 +1,327 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keyword" size="small" placeholder="责任人/养护名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.type" placeholder="养护类型" size="small" clearable>
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="养护状态" size="small" clearable>
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.bridgeId" placeholder="所属桥梁" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.roadId" placeholder="所属道路" size="small" clearable>
+          <el-option
+            v-for="item in bridgeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button size="small" class="edit_btn" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align">-->
+          <template slot-scope="scope">
+            <span v-if="column.text == '所属桥梁 / 道路'">{{ scope.row[column.value]!==''? scope.row[column.value]:scope.row['roadName'] }}</span>
+            <span v-else-if="column.text == '开始养护日期'">{{ scope.row[column.value].substr(0,10) }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="detail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-order v-show="editShow" ref="editorder" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getRecordList, delRecord } from '@/api/system/order'
+import editOrder from '@/views/order/editOrder'
+
+export default {
+  name: 'ListMaintainRecords',
+  components: { editOrder },
+  data() {
+    return {
+      listQuery: {
+        keyword: '', // 关键字（责任人/养护名称）
+        type: '', // 养护类型，字典值
+        status: '', // 养护状态，字典值
+        bridgeId: '', // 所属桥梁id
+        roadId: '',
+        startDate: '', // 养护开始日期
+        endDate: '', // 养护结束日期
+        offset: 1,
+        limit: 20,
+        sort: 'maintainTime',
+        order: 'desc'
+      }, // 筛选条件
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      }, // 表格属性
+      timeRange: [],
+      columns: [
+        {
+          text: '养护名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '养护编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '养护类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '养护状态',
+          value: 'statusName',
+          align: 'center'
+        },
+        {
+          text: '所属桥梁/道路',
+          value: 'bridgeName',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'personName',
+          align: 'center'
+        },
+        {
+          text: '开始养护日期',
+          value: 'maintainTime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      typeList: [
+        { value: '0', name: '日常养护' },
+        { value: '1', name: '小修保养工程' },
+        { value: '2', name: '中修工程' },
+        { value: '3', name: '大修工程' },
+        { value: '4', name: '改建工程' },
+        { value: '5', name: '专项工程' }
+      ],
+      statusList: [
+        { value: '1', name: '未启动' },
+        { value: '2', name: '进行中' },
+        { value: '3', name: '已结束' }
+      ],
+      bridgeList: [
+        { id: '1', name: '永胜桥' },
+        { id: '2', name: '黄洲桥' },
+        { id: '3', name: '光明桥' }
+      ],
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false // 是否显示编辑框
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getRecordList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.editorder.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.editorder.initDialog('update', true, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定删除该养护记录？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRecord(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '工单列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    },
+    clearInput() {
+      this.$message.success('clearInput')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .el-table th.gutter{
+    display: table-cell !important;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
new file mode 100644
index 0000000..9525867
--- /dev/null
+++ b/src/views/overview/overview.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <div v-loading="loading" class="overview-map-container">
+      <leaflet-map onload="mapReady">
+        <toilet-layer/>
+      </leaflet-map>
+      <!--<div id="map"/>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import L from 'leaflet'
+import 'leaflet/dist/leaflet.css'
+import { getDetail } from '@/api/system/bridge'
+import LeafletMap from '@/components/mapWindow/leafletMap'
+import ToiletLayer from './toiletLayer'
+export default {
+  name: 'Overview',
+  components: { ToiletLayer, LeafletMap },
+  data() {
+    return {
+      baselayer: [],
+      url: require('../../assets/global_images/location_green.png'),
+      bridgeList: [
+        { id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450 },
+        { id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659 },
+        { id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659 }
+      ],
+      bridgeInfo: {
+        id: '',
+        name: '',
+        typeName: '', // 桥型名称
+        bridgeCode: '', // 柱号
+        roadName: '', // 道路名称
+        height: '', // 高度
+        length: '', // 长度
+        buildTime: '', // 开建时间
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: '',
+        onlineState: ''
+      },
+      currentWindow: {
+        visible: false, // 窗体显示与否
+        position: [this.$store.getters.lng, this.$store.getters.lat],
+        windowType: 'info' // 窗体类型：详情info或报警alarm
+      }, // 当前窗体属性
+      loading: false,
+      icon: 'cross',
+      map: null,
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    // 地图加载完毕
+    mapReady (map) {
+      this.map = map
+    },
+    initMap() {
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 30,
+        center: [27.76062, 116.05071],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      map.on('click', function(e) {
+        console.log(e)
+        // var marker = new L.marker(e.latlng).addTo(map);
+      })
+      var Icon = L.icon({
+        iconUrl: require('../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+
+      for (var i = 0; i < 3; i++) {
+        var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], {
+          icon: Icon,
+          id: this.bridgeList[i].id
+        }).addTo(this.map)
+        item.on('click', function(e) {
+          if (e.target.dragging._marker._popup) {
+            e.target.dragging._marker.unbindPopup()
+          }
+          getDetail(e.target.options.id).then(response => {
+            var data = response.data
+            console.log(response.data)
+            var photo = data.photo ? data.photo : null
+            var str = '<div style="font-size: 14px;padding: 6px"> ' +
+              '<div style="font-size: 16px;font-weight: bold;padding-bottom: 10px">桥梁信息</div>' +
+              '<image src="' + photo + '" fit="fit" style="width: 300px; height: 180px; margin:5px; padding-right: 5px"' + '</image>' +
+              '<div style="padding-bottom: 10px; text-align: center">' + data.name + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁简介：</label>' + data.description	+ '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥梁位置：</label>' + data.position	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">桥型名称：</label>' + data.typeName	 + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">柱号：</label>' + data.bridgeCode + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">道路名称：</label>' + data.roadName + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">高度：</label>' + data.high + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">长度：</label>' + data.length + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">开建时间：</label>' + data.buildTime.substr(0, 10) + '</div>' +
+              '<div style="padding-bottom: 2px"><label style="padding-right: 5px">通车时间：</label>' + data.openTime.substr(0, 10) + '</div>' +
+              '</div>'
+            var popup = L.popup().setContent(str)
+            e.target.dragging._marker.bindPopup(popup).openPopup()
+            e.target.dragging._marker.openPopup()
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  #map {
+    width: 100%;
+    height: calc(100vh - 120px);
+  }
+// 查询框
+.map-search-div{
+  position: absolute;
+  z-index: 100;
+  padding: 5px 20px;
+  background-color: rgba(244, 244, 244, 0.9);
+  /*left: 90px;*/
+  .el-form-item{
+    margin-bottom: 0px;
+  }
+}
+  .infoWindowClass{
+    background-color: pink;
+  }
+// 报警列表
+.map-alarm-div{
+  position: absolute;
+  z-index: 100;
+  background-color: rgba(255, 234, 241,0.8);
+  top: 60px;
+  left: 10px;
+  .map-alarm-div-header{
+    line-height: 40px;
+    width: 504px;
+    padding-left: 10px;
+    .icon-right{
+      position: absolute;
+      right: 15px;
+    }
+    .icon-right:hover{
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+  .el-scrollbar {
+    /*height: 200px;*/
+    width: 100%;
+  }
+  .moredatascollor{
+    height: 200px;
+  }
+  .el-scrollbar__wrap {
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-bottom: 0px !important;
+}
+
+.el-table th{
+/*background-color: rgba(255, 229, 230, 0.8);*/
+    padding: 7px 0px;
+  }
+  .el-table td{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+    padding: 5px 0px;
+    /*line-height: 1;*/
+  }
+  // .el-table td:hover{
+    /*background-color: rgba(255, 234, 241, 0.8);*/
+  // }
+  .transition-box {
+    margin-bottom: 10px;
+    width: 200px;
+    height: 100px;
+    border-radius: 4px;
+    background-color: #409EFF;
+    text-align: center;
+    color: #fff;
+    padding: 40px 20px;
+    box-sizing: border-box;
+    margin-right: 20px;
+  }
+}
+// 刷新框
+.refresh-div{
+  position: absolute;
+  right: 10px;
+  top: 7px;
+  z-index: 100;
+  padding: 10px;
+  color: #ce8b74;
+  font-size: 14px;
+  background-color: rgba(244, 233, 230, 1.0);
+  .font-red{
+    color: red;
+    font-weight: bold;
+  }
+  .el-icon-refresh:hover{
+    color: red;
+    font-weight: bold;
+    cursor: pointer;
+  }
+}
+// 地图
+.overview-map-container{
+  width: 100%;
+  padding: 5px;
+  .map-demo{
+    width: 100%;
+    height: calc(100vh - 78px);
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width:30px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+    .info-window{
+      max-width: 250px;
+      /*background-color: lightcyan;*/
+      .info-header{
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        font-weight: bold;
+        /*background-color: #eaf4ff;*/
+      }
+      .info-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+      }
+    }
+    .alarm-window{
+      max-width: 250px;
+      /*background-color: #ffeaf1;*/
+      .alarm-header {
+        padding: 10px 10px 5px 10px;
+        line-height: 30px;
+        color: red;
+        font-weight: bold;
+        /*background-color: #ffecec;*/
+      }
+      .alarm-body{
+        padding: 5px 10px 10px 10px;
+        line-height: 23px;
+        font-size: 14px;
+        .alarm-red{
+          color: #ff0000;
+        }
+      }
+    }
+  }
+}
+  .el-divider--horizontal{
+    margin: 5px 0;
+  }
+</style>
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
new file mode 100644
index 0000000..2b3a511
--- /dev/null
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -0,0 +1,263 @@
+<!--公厕新增，编辑，详情-->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :fullscreen="false" :title="title" width="60%" append-to-body>
+    <div class="form-div">
+      <div class="form-left">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕编号：</span>
+              <span class="item-value-middle">{{ form.code }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">公厕名称：</span>
+              <span class="item-value-middle">{{ form.name }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">建设单位：</span>
+              <span class="item-value-middle">{{ form.owner }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">占地面积(m²)：</span>
+              <span class="item-value-middle">{{ form.area }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title">位置：</span>
+              <span class="item-value-middle">{{ form.position }} ( {{ form.lng }} , {{ form.lat }} )</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人：</span>
+              <span class="item-value-middle">{{ form.responsiblePerson }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">责任人电话：</span>
+              <span class="item-value-middle">{{ form.responsiblePersonTel }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">启用时间：</span>
+              <span class="item-value-middle">{{ form.ts }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">备注：</span>
+              <span class="item-value-middle">{{ form.notes }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="form-right">
+        <el-row>
+          <div class="avatar">
+            <el-image
+              :src="photo!==''?photo:defaultPhoto"
+              fit="cover"
+              style="width: 110px; height: 145px"/>
+          </div>
+          <div>
+            <el-rate
+              v-model="score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"/>
+          </div>
+        </el-row>
+      </div>
+
+    </div>
+    <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"
+      size="small"
+      @change="changePage"/>
+  </el-dialog>
+</template>
+
+<script>
+import { getRecordsByToilet, getToiletInfoDetail, getScoreByToilet } from '@/api/sanitation/toilet'
+import { getToday, getLastMonth } from '@/utils/dateutils'
+export default {
+  name: 'ToiletDetailDialog',
+  data() {
+    return {
+      title: '公厕详情',
+      dialogFormVisible: false,
+      listQuery: {
+        toiletId: '',
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 5
+      }, // 筛选条件
+      form: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      },
+      photo: '', // 图片路径
+      defaultPhoto: require('../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      score: 0,
+      columns: [
+        { text: '保洁时间 ', value: 'startTime', align: 'center' },
+        { text: '人员 ', value: 'name', align: 'center' },
+        { text: '保洁内容', value: 'jobContent', align: 'center' }
+      ], // 显示列
+      list: [],
+      total: 0, // 数据总数
+      listLoading: true, // 列表加载动画
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '保洁记录' // 标题名称
+        },
+        options: {
+          needIndex: true // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  methods: {
+    /**
+     * 初始化对话框
+     * @param listQuery 查询参数
+     */
+    initDialog: function(item) {
+      this.title = item.name + '详情'
+      this.listQuery = {
+        toiletId: item.id,
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
+        offset: 1,
+        limit: 5
+      }
+      this.form = item
+      this.dialogFormVisible = true
+      this.fetchToiletDetail()
+      this.fetchCleanRecords()
+      this.fetchScoreData()
+    },
+    // 获取公厕详情
+    fetchToiletDetail() {
+      getToiletInfoDetail(this.listQuery.toiletId).then(res => {
+        console.log(res)
+      })
+    },
+    // 保洁记录
+    fetchCleanRecords() {
+      this.listLoading = true
+      getRecordsByToilet(this.listQuery).then((res) => {
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
+        this.listLoading = false
+      })
+    },
+    // 获取评分
+    fetchScoreData() {
+      getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
+        if (res.code === 200) {
+          this.score = res.data
+        }
+      })
+    },
+    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;
+    margin-bottom: 10px;
+  }
+  .form-left{
+    flex:1;
+    height:100%;
+    .item-div{
+      line-height:2;
+      margin-left: 5px;
+      .item-title{
+        font-weight: bold;
+      }
+    }
+  }
+  .form-right{
+    width: 180px;
+    height:100%;
+    .avatar{
+      margin-bottom: 10px;
+    }
+    text-align: center;
+  }
+</style>
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
new file mode 100644
index 0000000..d784323
--- /dev/null
+++ b/src/views/overview/toiletLayer.vue
@@ -0,0 +1,152 @@
+<!--
+ * @Description: 公厕图层
+ * @Author: 王晓颖
+ * @Date: 2021-06-22 10:05:32
+ -->
+<template>
+  <div>
+    <toilet-detail-dialog ref="detail"/>
+  </div>
+</template>
+
+<script>
+import Leaflet from 'leaflet'
+import commonMixin from '@/components/mapWindow/base/mixins/common.js'
+import { getToiletList } from '@/api/sanitation/toilet'
+import ToiletDetailDialog from './toiletDetailDialog'
+export default {
+  name: 'ToiletLayer',
+  components: { ToiletDetailDialog },
+  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, layer, iconType) {
+      const { map, 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 + 'm²</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' + item.code + '">详情</button></div>' +
+          '</div>'
+
+        const popup = Leaflet.popup().setContent(popupStr)
+        if (item.lng > 0 && item.lat > 0) {
+          // 添加marker
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
+          marker.on('click', (e) => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
+              console.log('click detail')
+              this.detail(e.sourceTarget.options.item)
+            }
+          })
+        }
+      })
+    },
+    detail(item) {
+      this.$refs.detail.initDialog(item)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
new file mode 100644
index 0000000..a19b9e4
--- /dev/null
+++ b/src/views/rule/listRule.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="print(scope.row)">打印</el-button>
+            <el-button type="text" @click="download(scope.row)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getRuleList } from '@/api/system/rule'
+// import DownloadTemplate from '@/components/DownloadTemplate'
+
+export default {
+  name: 'ListRule',
+  components: { },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '规章制度名称',
+          value: 'filename',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deptTreeList: null, // 组织树列表数据
+      fileList: [],
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      wellShow: false
+    }
+  },
+  mounted() {
+    this.fetchData(false)
+  },
+  methods: {
+    // 编辑设备信息
+    print(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row.id)
+    },
+    download(row) {
+      this.$refs.editdevice.initDialog('detail', true, row.id)
+    },
+    // 获取设备数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      getRuleList().then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
new file mode 100644
index 0000000..d10eb38
--- /dev/null
+++ b/src/views/statistics/barChart.vue
@@ -0,0 +1,65 @@
+<template>
+  <ve-histogram
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'BarChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      if (this.listQuery.toiletId === '') {
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      } else {
+        countByToilet(this.listQuery).then(response => {
+          this.data.rows = response.data
+          console.log(this.data.rows)
+        })
+      }
+    }
+  }
+}
+</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/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
new file mode 100644
index 0000000..1560772
--- /dev/null
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -0,0 +1,100 @@
+<!--公厕新增，编辑，详情-->
+<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 { getScoreListByToilet } 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
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // 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>
+</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..28dedc5
--- /dev/null
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -0,0 +1,159 @@
+<!--评价统计-->
+<template>
+  <app-container>
+    <search-area @search="fetchData">
+      <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}"/>
+          </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 { getToiletEvaluation } from '@/api/sanitation/statistics'
+import EvaluationListDialog from './components/evaluationListDialog'
+export default {
+  name: 'ToiletAssessment',
+  components: { EvaluationListDialog },
+  data() {
+    return {
+      timeRange: [], // 按日统计面板中的日期范围
+      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.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      this.listLoading = true
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
+        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/pieChart.vue b/src/views/statistics/pieChart.vue
new file mode 100644
index 0000000..e4dd287
--- /dev/null
+++ b/src/views/statistics/pieChart.vue
@@ -0,0 +1,58 @@
+<template>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+export default {
+  name: 'PieChart',
+  data() {
+    this.chartSettings = {
+      labelMap: {
+        'cleanNum': '清洁次数',
+        'staticDate': '时间'
+      },
+      metrics: ['cleanNum'],
+      dimension: ['staticDate']
+    }
+    this.extend = {}
+    return {
+      listQuery: {
+        staticType: '',
+        toiletId: '',
+        startTime: '',
+        endTime: ''
+      },
+      data: {
+        columns: ['staticDate', 'cleanNum'],
+        rows: []
+      }
+    }
+  },
+  methods: {
+    fetchData(params) {
+      this.listQuery = params
+      countByDay(this.listQuery).then(response => {
+        this.data.rows = response.data
+      })
+    }
+  }
+}
+</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/statisticsChart.vue b/src/views/statistics/statisticsChart.vue
new file mode 100644
index 0000000..2c48fe0
--- /dev/null
+++ b/src/views/statistics/statisticsChart.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="chart-container">
+    <div ref="chart" class="chart-body" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+export default {
+  name: 'StatisticsChart',
+  props: {
+    list: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  computed: {
+    pieData() {
+      const tmp = []
+      this.list.forEach((item, index) => {
+        const obj = {}
+        obj.name = item.deptName
+        obj.value = item.num
+        tmp.push(obj)
+      })
+      return tmp
+    }
+  },
+  watch: {
+    list() {
+      this.initChart()
+    }
+  },
+  activated() {
+    this.initChart()
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.chart)
+      this.chart.setOption({
+        // tooltip: {
+        //   show: true
+        // }
+        // color: [
+        //   '#19d4ae', '#5ab1ef', '#fa6e86',
+        //   '#ffb980', '#0067a6', '#c4b4e4',
+        //   '#d87a80', '#9cbbff', '#d9d0c7',
+        //   '#87a997', '#d49ea2', '#5b4947',
+        //   '#7ba3a8'
+        // ]
+        // legend: {
+        //   orient: 'vertical',
+        //   right: 0,
+        //   data: this.pieData.map(item => item.name)
+        // }
+        // series: [{
+        //   name: '进出记录',
+        //   type: 'pie',
+        //   data: this.pieData,
+        //   label: {
+        //     show: true
+        //     // formatter: '{b}记录数:{c}条'
+        //   },
+        //   tooltip: {
+        //     // formatter: '{b}<br/>记录数: {d}%,{c}条'
+        //   }
+        // }]
+      })
+      this.chart.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container{
+  text-align: center;
+}
+.chart-body{
+  height: 60vh;
+  width: 80%;
+  margin-right: auto;
+  margin-left: auto;
+}
+</style>
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
new file mode 100644
index 0000000..67aa32b
--- /dev/null
+++ b/src/views/statistics/toiletAssessment.vue
@@ -0,0 +1,242 @@
+<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'
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      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/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..50a07f2
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,191 @@
+<template>
+  <app-container>
+    <!--<div class="statistic-container">-->
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-date-picker
+          v-model="year"
+          type="year"
+          placeholder="请选择统计年份"
+          value-format="yyyy"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="month"
+          type="month"
+          placeholder="请选择统计年月"
+          value-format="yyyy-MM"
+          size="small"
+          @change="fetchData1"/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData1">
+          <el-option
+            v-for="item in toiletList"
+            :key="item.toiletId"
+            :label="item.name"
+            :value="item.toiletId"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <div class="chart-container">
+      <el-row>
+        <el-col :span="24" class="chart-body" >
+          <div class="chart-body-title">按年/月清洁次数统计</div>
+          <bar-chart ref="chart1"/>
+        </el-col>
+      <!--<el-col :span="12" class="chart-body" >-->
+      <!--<div class="chart-body-select">-->
+      <!--<el-select v-model="listQuery.toiletId" placeholder="请选择公厕" size="small" clearable @change="fetchData2">-->
+      <!--<el-option-->
+      <!--v-for="item in toiletList"-->
+      <!--:key="item.toiletId"-->
+      <!--:label="item.name"-->
+      <!--:value="item.toiletId"/>-->
+      <!--</el-select>-->
+      <!--</div>-->
+      <!--<div class="chart-body-title" style="padding-top: 20px">按年/月清洁次数统计</div>-->
+      <!--<bar-chart ref="chart2"/>-->
+      <!--</el-col>-->
+      </el-row>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/system/statistics'
+import { getDayTime } from '@/utils/dateutils'
+import DeptSelect from '@/components/DeptSelect/index'
+import PieChart from './pieChart'
+import BarChart from './barChart'
+
+export default {
+  name: 'WorkStatistics',
+  components: { BarChart, PieChart, DeptSelect },
+  data() {
+    return {
+      year: '',
+      month: '',
+      listQuery: {
+        staticType: 'year',
+        toiletId: '',
+        startTime: '2020-01-01',
+        endTime: '2020-12-30'
+      },
+      toiletList: [{ toiletId: '9461', name: '公厕1' }, { toiletId: '9462', name: '公厕2' }, { toiletId: '9463', name: '公厕3' }], // 显示列
+      list: [], // 列表数据
+      chartList: [],
+      chartList2: [],
+      chartshow: false
+    }
+  },
+  watch: {},
+  mounted() {
+    this.fetchData1()
+    // this.fetchData2()
+  },
+  methods: {
+    // 获取统计数据
+    fetchData1() {
+      this.$refs.chart1.fetchData(this.listQuery)
+    },
+    fetchData2() {
+      this.$refs.chart2.fetchData(this.listQuery)
+    },
+    changeDate(date) {
+      let beginTime, endTime
+
+      if (date === 'today') {
+        beginTime = getDayTime(new Date().getTime())
+        endTime = new Date()
+        this.timeRange = [beginTime, endTime]
+      } else if (date === 'yesterday') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
+        endTime = getDayTime(new Date().getTime())
+      } else if (date === 'sevendays') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+        endTime = new Date()
+      } else if (date === 'lastmonth') {
+        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+        endTime = new Date()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      // this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleColor:#fff;
+  .app-container{
+    padding: 5px 10px 10px 10px;
+    .statistic-container{
+      margin: 10px;
+      padding:0px;
+      border: 1px solid #d3dce6;
+      .chart-tools{
+        background-color: #f2f2f2;
+        line-height: 40px;
+        padding-left: 10px;
+        padding-right: 5px;
+        .chart-tool-text{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button{
+          padding: 5px;
+          line-height: 16px;
+          margin-top:5px;
+          font-size:13px;
+        }
+        .chart-tool-button:hover{
+          background-color: #8cc5ff;
+          cursor: pointer;
+          color:white
+        }
+        .chart-tool-button:active{
+          background-color: #8cc5ff;
+          color:white
+        }
+        .editor--datetimerange.el-input__inner{
+          width: 300px;
+        }
+      }
+      .chart-title{
+        margin: auto;
+        text-align: center;
+        margin-top: 15px;
+      }
+    }
+    .chart-body{
+      padding:15px;
+      .chart-body-title {
+        font-size:22px;
+        text-align: center;
+        background-color: white;
+        padding-top: 20px;
+      }
+      .chart-body-select{
+        margin-top:20px;
+        text-align: center;
+        .select-label{
+          font-size: 15px;
+          color: #606266;
+          line-height: 40px;
+          font-weight:500;
+          padding: 0 6px 0 0
+        }
+      }
+    }
+  }
+  .chart-container{
+    background-color: $tableTitleColor !important;
+    border-top: 12px solid #ebebeb !important;
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..247c03d
--- /dev/null
+++ b/src/views/toilet/components/detail.vue
@@ -0,0 +1,431 @@
+<template>
+  <div class="info-block">
+    <div class="block-body">
+      <el-row class="body-right">
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥梁名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.name }}</span>
+              <!--<div class="item-value-middle"><el-input v-model="bridgeForm.name" :disabled="disabled"/></div>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">桥型：</span>
+              <span class="item-value-middle">{{ bridgeForm.typeName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.typeName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">柱号：</span>
+              <span class="item-value-middle">{{ bridgeForm.bridgeCode }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">道路名称：</span>
+              <span class="item-value-middle">{{ bridgeForm.roadName }}</span>
+              <!--<span class="item-value-middle"><el-input v-model="bridgeForm.roadName" :disabled="disabled"/></span>-->
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">高度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.height }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">长度（m）：</span>
+              <span class="item-value-middle">{{ bridgeForm.length }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">开建时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.buildTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="item-div">
+              <span class="item-title">通车时间：</span>
+              <span class="item-value-middle">{{ bridgeForm.openTime.substr(0,10) }}</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁图片：</span>
+              <span v-show="photo===''" class="item-value-middle">无</span>
+              <el-image
+                v-if="photo!==''"
+                :src="photo!==''?photo:null"
+                fit="cover"
+                style="width: 430px; height: 275px; margin-top:20px; margin-left: 10px;vertical-align: top;"/>
+              <el-upload
+                ref="upload"
+                :before-upload="handleBeforeUpload"
+                :http-request="uploadPhoto"
+                :show-file-list="false"
+                style="display: inline-block;vertical-align: top;"
+                action="string"
+                accept=".jpg,.jpeg,.png">
+                <el-button v-show="isEditMode" class="edit_btn" type="primary" size="small" style="vertical-align: bottom;" @click="uploadPhoto">上传桥梁图片</el-button>
+              </el-upload>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="item-div">
+              <span class="item-title">桥梁位置：</span>
+              <span class="item-value-middle">{{ bridgeForm.position }}</span>
+              <el-button class="edit_btn" size="small" @click="checkMap">查看地图</el-button>
+              <div v-if="showMap" style="height: 480px; width: 800px; margin-left: 130px" id="map" keep-alive/>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="item-div">
+              <span class="item-title" style="vertical-align: top;">桥梁简介：</span>
+              <span v-show="!isEditMode" class="item-value-long">{{ bridgeForm.description }}</span>
+              <span v-show="isEditMode" class="item-value-long" ><el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" show-word-limit/></span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row v-show="isEditMode" style="margin-top: 30px;text-align: center">
+          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button @click="cancel">取消</el-button>
+        </el-row>
+      </el-row>
+    </div>
+    <div class="clearfloat"/>
+  </div>
+</template>
+<script>
+import { getDetail, updateBridge } from '@/api/sanitation/toilet'
+import L from 'leaflet'
+
+export default {
+  name: 'Detail',
+  data() {
+    return {
+      showMap: false,
+      isEditMode: false,
+      bridgeList: [
+        {id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450},
+        {id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659},
+        {id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659}
+      ],
+      map: null,
+      baselayer: [],
+      icon: 'static/images/well/0100.png',
+      photo: '',
+      bridgeForm: {
+        id: '',
+        name: '',
+        type: '',
+        typeName: '',
+        bridgeCode: '',
+        roadName: '',
+        height: '',
+        length: '',
+        buildTime: '',
+        openTime: '',
+        position: '',
+        description: '',
+        status: '',
+        statusName: '',
+        photo: ''
+      },
+      // baseUrl: process.env.BASE_API + '/static/', // 图片基础路径
+      // token: '?token=' + this.$store.getters.token, // token,
+      disabled: true,
+      defaultPhoto: '' // require('../../../assets/global_images/photo.jpg') // 默认图片路径
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    fetchData(bridgeId) {
+      getDetail(bridgeId).then(response => {
+        this.bridgeForm = response.data
+        this.photo = this.bridgeForm.photo
+        this.listLoading = false
+      })
+    },
+    checkMap() {
+      this.initMap()
+      this.initMap()
+    },
+    initMap() {
+      debugger
+      this.showMap = true
+      const map = L.map('map', {
+        minZoom: 2,
+        maxZoom: 18,
+        center: [27.763248, 116.043450],
+        zoom: 16,
+        zoomControl: false,
+        attributionControl: false,
+        crs: L.CRS.EPSG3857
+      })
+      map.invalidateSize(true)
+      map.doubleClickZoom.disable()
+      this.map = map // data上需要挂载
+      window.map = map
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      this.baselayer.push(L.tileLayer(
+        'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8',
+        { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] }
+      ).addTo(map))
+      var Icon = L.icon({
+        iconUrl: require('../../../assets/global_images/location_green.png'),
+        iconSize: [30, 30]
+      })
+      if(this.bridgeForm.name === '永胜桥') {
+        this.map.setView({ lat: 27.763248, lng: 116.043450 }, 16)
+        L.marker([27.763248, 116.043450], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '黄洲桥') {
+        this.map.setView({ lat: 27.760096, lng: 116.053659 }, 16)
+        L.marker([27.760096, 116.053659], {
+          icon: Icon
+        }).addTo(this.map)
+      } else if(this.bridgeForm.name === '光明桥') {
+        this.map.setView({ lat: 27.767046, lng: 116.058659 }, 16)
+        L.marker([27.767046, 116.058659], {
+          icon: Icon
+        }).addTo(this.map)
+      }
+    },
+    showUploadBut() {
+      this.isEditMode = true
+    },
+    saveData() {
+      // 照片不为空则对照片进行处理
+      if (this.photo !== '') {
+        let index = this.photo.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        this.bridgeForm.photo = this.photo.substring(index)
+      }
+      updateBridge(this.bridgeForm).then(res => {
+        if (res.code === 200) {
+          this.$message.success('编辑成功')
+        }
+      })
+      this.isEditMode = false
+    },
+    // 图片上传
+    uploadPhoto(file) {
+      // console.log('uploadFile:' + file.file.name)
+      // const base_url = process.env.BASE_API + '/static/'
+
+      // 转base64
+      this.getBase64(file.file).then(resBase64 => {
+        this.photo = 'data:image/png;base64,' + resBase64.split(',')[1] // 直接拿到base64信息
+        console.log(this.photo)
+      })
+    },
+    // 上传前判断文件格式及大小
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      console.log(file.size)
+      const isLt2M = file.size / 1024 < 200
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 200KB!')
+        res = false
+      }
+      return res
+    },
+    // 上传成功后回显
+    handleSuccess(response, file) {
+      console.log('handleSuccess')
+      debugger
+      const base_url = process.env.BASE_API + '/static/'
+      if (response.code === 200) {
+        this.photo = base_url + response.data
+      } else {
+        this.$message.warning(response.message)
+      }
+    },
+    getBase64(file) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        let fileResult = ''
+        reader.readAsDataURL(file)
+        // 开始转
+        reader.onload = function() {
+          fileResult = reader.result
+        }
+        // 转 失败
+        reader.onerror = function(error) {
+          reject(error)
+        }
+        // 转 结束  咱就 resolve 出去
+        reader.onloadend = function() {
+          resolve(fileResult)
+        }
+      })
+    },
+    cancel() {
+      this.isEditMode = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $left-width: 160px;
+  .info-block{
+    /*overflow-y: scroll;*/
+    /*white-space: nowrap;*/
+    margin: 10px 20px;
+    padding-bottom: 120px;
+    /*overflow: ;*/
+    .block-title-div{
+      font-size: 17px;
+      color: #1f2d3d;
+      font-weight: bold;
+      /*border-bottom: 1px solid #d3dce6;*/
+      .block-title{
+        padding-left: 10px;
+        margin-bottom: 10px;
+        /*border-left: 5px solid #004493;*/
+      }
+    }
+    .block-body{
+      margin-top: 20px;
+      margin-left: 50px;
+      .body-left{
+        width: $left-width;
+        /*float: left;*/
+      }
+      .body-right{
+        width: calc( 100% - 160px );
+        float: left;
+        .item-div{
+          line-height: 55px;
+          font-size:17px;
+          .item-title{
+            text-align: right;
+            width:120px;
+            color: #909090;
+            font-weight: bold;
+            display: inline-block;
+          }
+          .item-value-middle{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 280px !important;
+            display: inline-block;
+          }
+          .item-value-long{
+            margin-left: 10px;
+            color: #a5a5a5;
+            width: 680px !important;
+            display: inline-block;
+          }
+        }
+      }
+    }
+    .person-photo{
+      width: 106px;
+      height: 150px;
+      padding: 1px;
+      border: 1px solid #92dfff;
+    }
+
+  }
+  avatar-uploader .el-upload {
+    margin-left: 12px;
+    margin-top: 10px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar {
+    margin: 10px;
+    display: block;
+  }
+  // 地图
+  .overview-map-container{
+    width: 100%;
+    padding: 5px;
+    .map-demo{
+      width: 100%;
+      height: calc(100vh - 78px);
+      .svg-icon{
+        width: 20px;
+        height: 20px;
+      }
+      .alarm-icon{
+        width:30px;
+        height: 30px;
+      }
+      .nomal-info-window{
+        background-color: pink;
+      }
+      .info-window{
+        max-width: 250px;
+        /*background-color: lightcyan;*/
+        .info-header{
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          font-weight: bold;
+          /*background-color: #eaf4ff;*/
+        }
+        .info-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+        }
+      }
+      .alarm-window{
+        max-width: 250px;
+        /*background-color: #ffeaf1;*/
+        .alarm-header {
+          padding: 10px 10px 5px 10px;
+          line-height: 30px;
+          color: red;
+          font-weight: bold;
+          /*background-color: #ffecec;*/
+        }
+        .alarm-body{
+          padding: 5px 10px 10px 10px;
+          line-height: 23px;
+          font-size: 14px;
+          .alarm-red{
+            color: #ff0000;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/editToilet.vue b/src/views/toilet/components/editToilet.vue
new file mode 100644
index 0000000..000deea
--- /dev/null
+++ b/src/views/toilet/components/editToilet.vue
@@ -0,0 +1,368 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" style="width: 1800px" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="toiletForm" label-position="right" label-width="130px">
+      <div class="form-div">
+        <div class="form-left">
+          <el-row :gutter="20">
+            <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="20">
+            <el-col :span="12">
+              <el-form-item label="占地面积" prop="area">
+                <el-input v-model.trim="toiletForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+              </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="20">
+            <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="20">
+            <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="20">
+            <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"
+                  style="width: 100%"
+                  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 slot="footer" class="dialog-footer">
+      <el-button v-show="!isDetailMode" type="primary" @click="saveData">保存</el-button>
+      <el-button v-show="!isDetailMode" @click="cancel">取消</el-button>
+      <el-button v-show="isDetailMode" @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/',
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      isDetailMode: false,
+      photo: '', // 图片路径
+      defaultPhoto: require('../../../assets/global_images/toiletPhoto.png'), // 默认图片路径
+      toiletForm: {
+        id: '', // id
+        code: '', // 编号
+        name: '', // 名称
+        owner: '', // 建设单位
+        area: '', // 占地面积
+        position: '', // 位置：社区/道路
+        lng: '', // 经度
+        lat: '', // 纬度
+        responsiblePerson: '', // 责任人
+        responsiblePersonTel: '', // 责任人电话
+        ts: '', // 启用时间
+        notes: '' // 备注
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      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'] }]
+      } // 前端校验规则
+    }
+  },
+  computed: {
+  },
+  mounted: function() {
+    // this.fetchPcode()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        debugger
+        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: '' // 备注
+      }
+      this.photo = ''
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      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()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      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
+            }
+          })
+        }
+      })
+    },
+    // 打开地图选点
+    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)
+    },
+    // 图片上传
+    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)
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.isDetailMode = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    width:700px
+  }
+  .el-select{
+    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/toilet/listToilet.vue b/src/views/toilet/listToilet.vue
new file mode 100644
index 0000000..2c5209e
--- /dev/null
+++ b/src/views/toilet/listToilet.vue
@@ -0,0 +1,237 @@
+<template>
+  <app-container>
+    <search-area :need-clear="true" :need-search-more="false" type="seperate" size="small" 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.owner" size="small" placeholder="建设单位" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.position" size="small" placeholder="位置" clearable/>
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" size="small" @change="changePage">
+      <template slot="btns">
+        <el-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        <el-button size="small" class="edit_btn" @click="add">添加</el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
+            <el-button type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-toilet v-show="editShow" ref="edittoilet" @watchChild="fetchData"/>
+  </app-container>
+</template>
+
+<script>
+import { getToiletList, delToilet } from '@/api/sanitation/toilet'
+import EditToilet from './components/editToilet'
+
+export default {
+  name: 'ListToilet',
+  components: { EditToilet },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字（编号、名称）
+        owner: '', // 建设单位
+        position: '', // 道路
+        offset: 1,
+        limit: 20,
+        sort: 'ts',
+        order: 'desc'
+      }, // 筛选条件
+      timeRange: [],
+      columns: [
+        {
+          text: '公厕编号',
+          value: 'code',
+          align: 'center'
+        },
+        {
+          text: '公厕名称',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '建设单位',
+          value: 'owner',
+          align: 'center'
+        },
+        {
+          text: '建设时间',
+          value: 'ts',
+          align: 'center'
+        },
+        {
+          text: '街道',
+          value: 'position',
+          align: 'center'
+        },
+        {
+          text: '占地面积',
+          value: 'area',
+          align: 'center'
+        },
+        {
+          text: '责任人',
+          value: 'responsiblePerson',
+          align: 'center'
+        },
+        {
+          text: '责任人电话',
+          value: 'responsiblePersonTel',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      tableOption: {
+        head: {
+          show: true, // 是否需要标题栏，
+          text: '数据列表' // 标题名称
+        },
+        options: {
+          needIndex: false // 是否需要序号列
+        },
+        toolsOption: {
+          selectColumns: false, // 是否需要筛选列
+          refresh: false // 是否需要刷新按钮
+        }
+      } // 表格属性
+    }
+  },
+  mounted() {
+    this.fetchData(false)// 获取数据
+  },
+  methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getToiletList(this.listQuery).then(response => {
+        debugger
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    add() {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('create', true, null)
+    },
+    detail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    edit(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('update', true, row)
+    },
+    // 删除单个公厕
+    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()
+          }
+        })
+      })
+    },
+    batchExport() {
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '下载中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      // exportRecords(this.listQuery).then(res => {
+      //   loading.close() // 关闭加载动画
+      //   downloadFile(res.data, '识别记录列表')
+      // }).catch((res) => {
+      //   loading.close()
+      // })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .form-container {
+    .selectForm-container-item {
+      width: 220px;
+    }
+  }
+</style>
diff --git a/src/views/toilet/listWork.vue b/src/views/toilet/listWork.vue
new file mode 100644
index 0000000..9281717
--- /dev/null
+++ b/src/views/toilet/listWork.vue
@@ -0,0 +1,206 @@
+<template>
+  <app-container>
+    <search-area :need-clear="false" :need-search-more="false" type="default" size="small" @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="datetimerange"
+          size="small"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </search-area>
+    <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
+      <template slot="btns">
+        <el-button 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 NormalTable from '@/components/NormalTable'
+import AppContainer from '@/components/layout/AppContainer'
+import SearchArea from '@/components/SearchArea/SearchArea'
+import SearchItem from '@/components/SearchArea/SearchItem'
+import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
+export default {
+  name: 'ListWork',
+  components: { SearchItem, SearchArea, AppContainer, NormalTable },
+  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'
+        }
+      ], // 显示列
+      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
+      // this.list = [
+      //   { toiletCode: 1, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-28 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 2, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-27 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' },
+      //   { toiletCode: 3, name: '张三', jobContent: '清理公厕', toiletName: '1号公厕', toiletPosition: '活力大道', startTime: '2020-12-26 08:00:00', endTime: '2020-12-29 09:00:00', notes: '无' }
+      // ]
+      // this.total = this.list.length
+      // this.listLoading = false
+      getToiletJobRecords(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = response.data.total
+          this.listLoading = false
+        }
+      })
+    },
+    // 点击详情
+    goDetail(row) {
+      this.editShow = true
+      this.$refs.edittoilet.initDialog('detail', true, row)
+    },
+    // 批量导出
+    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: '', // 关键字
+        type: '', // 公厕类型
+        post: '', // 岗位
+        ts: '', // 入职年月时间
+        jobCode: '', // 作业内容
+        responseArea: '', // 负责片区
+        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/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
new file mode 100644
index 0000000..9ed5b84
--- /dev/null
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -0,0 +1,210 @@
+<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'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+
+export default {
+  name: 'ToiletCleanList',
+  data() {
+    return {
+      dateRange: [getLastWeek('yyyy-MM-dd hh:mm:ss'), getToday('yyyy-MM-dd hh:mm:ss')], // 日期范围
+      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.dateRange = [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')]
+    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 && 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..1323d1e
--- /dev/null
+++ b/src/views/toiletManage/editToilet.vue
@@ -0,0 +1,407 @@
+<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="占地面积(m²)" 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..0860556
--- /dev/null
+++ b/src/views/toiletManage/toiletList.vue
@@ -0,0 +1,285 @@
+<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: '占地面积(m²)',
+          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 73a7460..643a5ff 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,8 +1,8 @@
 {
-  "title": "基础资源系统",
+  "title": "公共厕所管理系统",
   "baseUrl": "http://111.198.10.15:11409/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
-  "singleSys": false,
+  "singleSys": true,
   "city":"崇仁县",
   "mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8",
   "labelUrl":"https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8",