diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index ff9f9a1..641e1bf 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -31,7 +31,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getDetail } from '@/api/system/bridge'
+import { getDetail } from '@/api/bridge'
 // import icon from '/static/images/well/0100.png'
 // import { getAllMarker } from '@/api/overview'
 // import { getMarkerInfo } from '@/api/marker'

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index ff9f9a1..641e1bf 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -31,7 +31,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getDetail } from '@/api/system/bridge'
+import { getDetail } from '@/api/bridge'
 // import icon from '/static/images/well/0100.png'
 // import { getAllMarker } from '@/api/overview'
 // import { getMarkerInfo } from '@/api/marker'
diff --git a/src/views/rule/components/setThresh.vue b/src/views/rule/components/setThresh.vue
deleted file mode 100644
index a0ee404..0000000
--- a/src/views/rule/components/setThresh.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
-      <el-form ref="dataForm" :rules="rules" :model="monitorForm" label-well-code="right" label-width="140px">
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="监控点名称" prop="monitorName">
-              <el-input v-model.trim="monitorForm.monitorName" disabled type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="所属场站" prop="stationName">
-              <el-input v-model="monitorForm.stationName" disabled placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="燃气浓度报警阈值" prop="high">
-              <el-input v-model.trim="monitorForm.high" type="number" :min="0" placeholder="燃气浓度报警阈值"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { setThresh } from '@/api/system/alarm'
-
-export default {
-  name: 'SetThresh',
-  data() {
-    const validateHigh = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('消警持续时间不能为空'))
-      }
-    }
-    return {
-      listLoading: true,
-      dialogFormVisible: false, // 对话框是否显示
-      monitorForm: {
-        stationName: '',
-        monitorId: '',
-        monitorName: '',
-        high: '' // 报警阈值
-      },
-      title: '', // 表头显示标题
-      rules: {
-        high: [{ required: true, validator: validateHigh, trigger: ['change', 'blur'] }]
-      } // 前端校验规则
-    }
-  },
-  watch: { },
-  mounted() { },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, monitorInfo) {
-      debugger
-      this.dialogFormVisible = dialogFormVisible
-      this.title = '设置监控点报警阈值'
-      this.monitorForm.stationName = monitorInfo.stationName
-      this.monitorForm.monitorName = monitorInfo.monitorPointName
-      this.monitorForm.monitorId = monitorInfo.monitorPointId
-      this.monitorForm.high = monitorInfo.high
-    },
-    // 重置表单
-    resetForm() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      // 表单校验
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          setThresh(this.monitorForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('设置成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .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
-    }
-  }
-  .dialog-footer{
-    text-align: right;
-    margin-top: 10px;
-  }
-</style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index ff9f9a1..641e1bf 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -31,7 +31,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getDetail } from '@/api/system/bridge'
+import { getDetail } from '@/api/bridge'
 // import icon from '/static/images/well/0100.png'
 // import { getAllMarker } from '@/api/overview'
 // import { getMarkerInfo } from '@/api/marker'
diff --git a/src/views/rule/components/setThresh.vue b/src/views/rule/components/setThresh.vue
deleted file mode 100644
index a0ee404..0000000
--- a/src/views/rule/components/setThresh.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
-      <el-form ref="dataForm" :rules="rules" :model="monitorForm" label-well-code="right" label-width="140px">
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="监控点名称" prop="monitorName">
-              <el-input v-model.trim="monitorForm.monitorName" disabled type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="所属场站" prop="stationName">
-              <el-input v-model="monitorForm.stationName" disabled placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="燃气浓度报警阈值" prop="high">
-              <el-input v-model.trim="monitorForm.high" type="number" :min="0" placeholder="燃气浓度报警阈值"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { setThresh } from '@/api/system/alarm'
-
-export default {
-  name: 'SetThresh',
-  data() {
-    const validateHigh = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('消警持续时间不能为空'))
-      }
-    }
-    return {
-      listLoading: true,
-      dialogFormVisible: false, // 对话框是否显示
-      monitorForm: {
-        stationName: '',
-        monitorId: '',
-        monitorName: '',
-        high: '' // 报警阈值
-      },
-      title: '', // 表头显示标题
-      rules: {
-        high: [{ required: true, validator: validateHigh, trigger: ['change', 'blur'] }]
-      } // 前端校验规则
-    }
-  },
-  watch: { },
-  mounted() { },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, monitorInfo) {
-      debugger
-      this.dialogFormVisible = dialogFormVisible
-      this.title = '设置监控点报警阈值'
-      this.monitorForm.stationName = monitorInfo.stationName
-      this.monitorForm.monitorName = monitorInfo.monitorPointName
-      this.monitorForm.monitorId = monitorInfo.monitorPointId
-      this.monitorForm.high = monitorInfo.high
-    },
-    // 重置表单
-    resetForm() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      // 表单校验
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          setThresh(this.monitorForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('设置成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .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
-    }
-  }
-  .dialog-footer{
-    text-align: right;
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
index a19b9e4..b693382 100644
--- a/src/views/rule/listRule.vue
+++ b/src/views/rule/listRule.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getRuleList } from '@/api/system/rule'
+import { getRuleList } from '@/api/rule'
 // import DownloadTemplate from '@/components/DownloadTemplate'
 
 export default {

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index ff9f9a1..641e1bf 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -31,7 +31,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getDetail } from '@/api/system/bridge'
+import { getDetail } from '@/api/bridge'
 // import icon from '/static/images/well/0100.png'
 // import { getAllMarker } from '@/api/overview'
 // import { getMarkerInfo } from '@/api/marker'
diff --git a/src/views/rule/components/setThresh.vue b/src/views/rule/components/setThresh.vue
deleted file mode 100644
index a0ee404..0000000
--- a/src/views/rule/components/setThresh.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
-      <el-form ref="dataForm" :rules="rules" :model="monitorForm" label-well-code="right" label-width="140px">
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="监控点名称" prop="monitorName">
-              <el-input v-model.trim="monitorForm.monitorName" disabled type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="所属场站" prop="stationName">
-              <el-input v-model="monitorForm.stationName" disabled placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="燃气浓度报警阈值" prop="high">
-              <el-input v-model.trim="monitorForm.high" type="number" :min="0" placeholder="燃气浓度报警阈值"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { setThresh } from '@/api/system/alarm'
-
-export default {
-  name: 'SetThresh',
-  data() {
-    const validateHigh = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('消警持续时间不能为空'))
-      }
-    }
-    return {
-      listLoading: true,
-      dialogFormVisible: false, // 对话框是否显示
-      monitorForm: {
-        stationName: '',
-        monitorId: '',
-        monitorName: '',
-        high: '' // 报警阈值
-      },
-      title: '', // 表头显示标题
-      rules: {
-        high: [{ required: true, validator: validateHigh, trigger: ['change', 'blur'] }]
-      } // 前端校验规则
-    }
-  },
-  watch: { },
-  mounted() { },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, monitorInfo) {
-      debugger
-      this.dialogFormVisible = dialogFormVisible
-      this.title = '设置监控点报警阈值'
-      this.monitorForm.stationName = monitorInfo.stationName
-      this.monitorForm.monitorName = monitorInfo.monitorPointName
-      this.monitorForm.monitorId = monitorInfo.monitorPointId
-      this.monitorForm.high = monitorInfo.high
-    },
-    // 重置表单
-    resetForm() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      // 表单校验
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          setThresh(this.monitorForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('设置成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .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
-    }
-  }
-  .dialog-footer{
-    text-align: right;
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
index a19b9e4..b693382 100644
--- a/src/views/rule/listRule.vue
+++ b/src/views/rule/listRule.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getRuleList } from '@/api/system/rule'
+import { getRuleList } from '@/api/rule'
 // import DownloadTemplate from '@/components/DownloadTemplate'
 
 export default {
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
index 34910e2..b23f51d 100644
--- a/src/views/statistics/barChart.vue
+++ b/src/views/statistics/barChart.vue
@@ -1,51 +1,54 @@
 <template>
   <ve-histogram
     :data="data"
-    :settings="chartSettings"
-    :extend="extend"/>
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'BarChart',
-  props: {
-    data: {
-      type: Object,
-      default() {
-        return {
-          columns: ['typeName', 'count'],
+import { countByToilet, countByDay } from '@/api/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: []
         }
       }
-    }
-  },
-  data() {
-    return {
-      extend: {
-        series: {
-          label: { show: true, position: 'top' },
-          itemStyle: {
-            normal: {
-              barBorderRadius: [3, 3, 0, 0]
-            }
-          },
-          barMaxWidth: 35
+    },
+    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)
+          })
         }
       },
-      chartSettings: {
-        labelMap: {
-          'inoutType': '进出类型',
-          'num': '进出数量'
-        },
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        demension: 'inoutType',
-        barWidth: 15
-      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index ff9f9a1..641e1bf 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -31,7 +31,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getDetail } from '@/api/system/bridge'
+import { getDetail } from '@/api/bridge'
 // import icon from '/static/images/well/0100.png'
 // import { getAllMarker } from '@/api/overview'
 // import { getMarkerInfo } from '@/api/marker'
diff --git a/src/views/rule/components/setThresh.vue b/src/views/rule/components/setThresh.vue
deleted file mode 100644
index a0ee404..0000000
--- a/src/views/rule/components/setThresh.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
-      <el-form ref="dataForm" :rules="rules" :model="monitorForm" label-well-code="right" label-width="140px">
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="监控点名称" prop="monitorName">
-              <el-input v-model.trim="monitorForm.monitorName" disabled type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="所属场站" prop="stationName">
-              <el-input v-model="monitorForm.stationName" disabled placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="燃气浓度报警阈值" prop="high">
-              <el-input v-model.trim="monitorForm.high" type="number" :min="0" placeholder="燃气浓度报警阈值"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { setThresh } from '@/api/system/alarm'
-
-export default {
-  name: 'SetThresh',
-  data() {
-    const validateHigh = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('消警持续时间不能为空'))
-      }
-    }
-    return {
-      listLoading: true,
-      dialogFormVisible: false, // 对话框是否显示
-      monitorForm: {
-        stationName: '',
-        monitorId: '',
-        monitorName: '',
-        high: '' // 报警阈值
-      },
-      title: '', // 表头显示标题
-      rules: {
-        high: [{ required: true, validator: validateHigh, trigger: ['change', 'blur'] }]
-      } // 前端校验规则
-    }
-  },
-  watch: { },
-  mounted() { },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, monitorInfo) {
-      debugger
-      this.dialogFormVisible = dialogFormVisible
-      this.title = '设置监控点报警阈值'
-      this.monitorForm.stationName = monitorInfo.stationName
-      this.monitorForm.monitorName = monitorInfo.monitorPointName
-      this.monitorForm.monitorId = monitorInfo.monitorPointId
-      this.monitorForm.high = monitorInfo.high
-    },
-    // 重置表单
-    resetForm() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      // 表单校验
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          setThresh(this.monitorForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('设置成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .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
-    }
-  }
-  .dialog-footer{
-    text-align: right;
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
index a19b9e4..b693382 100644
--- a/src/views/rule/listRule.vue
+++ b/src/views/rule/listRule.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getRuleList } from '@/api/system/rule'
+import { getRuleList } from '@/api/rule'
 // import DownloadTemplate from '@/components/DownloadTemplate'
 
 export default {
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
index 34910e2..b23f51d 100644
--- a/src/views/statistics/barChart.vue
+++ b/src/views/statistics/barChart.vue
@@ -1,51 +1,54 @@
 <template>
   <ve-histogram
     :data="data"
-    :settings="chartSettings"
-    :extend="extend"/>
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'BarChart',
-  props: {
-    data: {
-      type: Object,
-      default() {
-        return {
-          columns: ['typeName', 'count'],
+import { countByToilet, countByDay } from '@/api/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: []
         }
       }
-    }
-  },
-  data() {
-    return {
-      extend: {
-        series: {
-          label: { show: true, position: 'top' },
-          itemStyle: {
-            normal: {
-              barBorderRadius: [3, 3, 0, 0]
-            }
-          },
-          barMaxWidth: 35
+    },
+    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)
+          })
         }
       },
-      chartSettings: {
-        labelMap: {
-          'inoutType': '进出类型',
-          'num': '进出数量'
-        },
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        demension: 'inoutType',
-        barWidth: 15
-      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/maintainStatistics.vue b/src/views/statistics/maintainStatistics.vue
deleted file mode 100644
index a86e235..0000000
--- a/src/views/statistics/maintainStatistics.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="statistic-container">
-      <el-row class="chart-tools">
-        <el-col :span="5" >
-          <el-date-picker
-            v-model="listQuery.year"
-            type="year"
-            placeholder="请选择统计年份"
-            value-format="yyyy"
-            size="small"
-            @change="fetchData"/>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24" class="chart-body" >
-          <div class="chart-body-title">各类型养护数量统计及占比</div>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12" class="chart-body" >
-          <pie-chart :list="chartList"/>
-        </el-col>
-        <el-col :span="12" class="chart-body">
-          <el-table :data="list" class="table" border style="margin-top: 50px">
-            <el-table-column 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">
-              <template slot-scope="scope">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-      </el-row>
-    </div>
-  </div>
-</template>
-
-<script>
-import { countByYear } 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: 'MaintainStatistics',
-  components: { BarChart, PieChart, DeptSelect },
-  data() {
-    return {
-      listQuery: {
-        year: '',
-        offset: 1,
-        limit: 20,
-        sort: 'count',
-        order: 'desc'
-      },
-      columns: [
-        {
-          text: '养护类型',
-          value: 'typeName',
-          align: 'center'
-        },
-        {
-          text: '养护数量',
-          value: 'count',
-          align: 'center'
-        },
-        {
-          text: '占比',
-          value: 'percent',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      chartList: [],
-      chartshow: false
-    }
-  },
-  watch: {},
-  mounted() {
-    this.fetchData()
-  },
-  activated() {
-    this.fetchData()
-  },
-  methods: {
-    // 获取统计数据
-    fetchData() {
-      console.log('this.fetchData')
-      countByYear(this.listQuery).then(response => {
-        // var data = response.data
-        // for (var i = 0; i < data.length; i++) {
-        //   data[i].num = parseInt(data[i].num)
-        // }
-        this.chartList = response.data.rows
-        this.list = response.data.rows
-      })
-    },
-    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>
-  .app-container{
-    .statistic-container{
-      background-color: #fffffb !important;
-      height: auto;
-      min-height: calc(100vh - 158px);
-      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
-        }
-      }
-    }
-  }
-</style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index ff9f9a1..641e1bf 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -31,7 +31,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getDetail } from '@/api/system/bridge'
+import { getDetail } from '@/api/bridge'
 // import icon from '/static/images/well/0100.png'
 // import { getAllMarker } from '@/api/overview'
 // import { getMarkerInfo } from '@/api/marker'
diff --git a/src/views/rule/components/setThresh.vue b/src/views/rule/components/setThresh.vue
deleted file mode 100644
index a0ee404..0000000
--- a/src/views/rule/components/setThresh.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
-      <el-form ref="dataForm" :rules="rules" :model="monitorForm" label-well-code="right" label-width="140px">
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="监控点名称" prop="monitorName">
-              <el-input v-model.trim="monitorForm.monitorName" disabled type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="所属场站" prop="stationName">
-              <el-input v-model="monitorForm.stationName" disabled placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="燃气浓度报警阈值" prop="high">
-              <el-input v-model.trim="monitorForm.high" type="number" :min="0" placeholder="燃气浓度报警阈值"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { setThresh } from '@/api/system/alarm'
-
-export default {
-  name: 'SetThresh',
-  data() {
-    const validateHigh = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('消警持续时间不能为空'))
-      }
-    }
-    return {
-      listLoading: true,
-      dialogFormVisible: false, // 对话框是否显示
-      monitorForm: {
-        stationName: '',
-        monitorId: '',
-        monitorName: '',
-        high: '' // 报警阈值
-      },
-      title: '', // 表头显示标题
-      rules: {
-        high: [{ required: true, validator: validateHigh, trigger: ['change', 'blur'] }]
-      } // 前端校验规则
-    }
-  },
-  watch: { },
-  mounted() { },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, monitorInfo) {
-      debugger
-      this.dialogFormVisible = dialogFormVisible
-      this.title = '设置监控点报警阈值'
-      this.monitorForm.stationName = monitorInfo.stationName
-      this.monitorForm.monitorName = monitorInfo.monitorPointName
-      this.monitorForm.monitorId = monitorInfo.monitorPointId
-      this.monitorForm.high = monitorInfo.high
-    },
-    // 重置表单
-    resetForm() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      // 表单校验
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          setThresh(this.monitorForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('设置成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .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
-    }
-  }
-  .dialog-footer{
-    text-align: right;
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
index a19b9e4..b693382 100644
--- a/src/views/rule/listRule.vue
+++ b/src/views/rule/listRule.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getRuleList } from '@/api/system/rule'
+import { getRuleList } from '@/api/rule'
 // import DownloadTemplate from '@/components/DownloadTemplate'
 
 export default {
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
index 34910e2..b23f51d 100644
--- a/src/views/statistics/barChart.vue
+++ b/src/views/statistics/barChart.vue
@@ -1,51 +1,54 @@
 <template>
   <ve-histogram
     :data="data"
-    :settings="chartSettings"
-    :extend="extend"/>
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'BarChart',
-  props: {
-    data: {
-      type: Object,
-      default() {
-        return {
-          columns: ['typeName', 'count'],
+import { countByToilet, countByDay } from '@/api/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: []
         }
       }
-    }
-  },
-  data() {
-    return {
-      extend: {
-        series: {
-          label: { show: true, position: 'top' },
-          itemStyle: {
-            normal: {
-              barBorderRadius: [3, 3, 0, 0]
-            }
-          },
-          barMaxWidth: 35
+    },
+    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)
+          })
         }
       },
-      chartSettings: {
-        labelMap: {
-          'inoutType': '进出类型',
-          'num': '进出数量'
-        },
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        demension: 'inoutType',
-        barWidth: 15
-      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/maintainStatistics.vue b/src/views/statistics/maintainStatistics.vue
deleted file mode 100644
index a86e235..0000000
--- a/src/views/statistics/maintainStatistics.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="statistic-container">
-      <el-row class="chart-tools">
-        <el-col :span="5" >
-          <el-date-picker
-            v-model="listQuery.year"
-            type="year"
-            placeholder="请选择统计年份"
-            value-format="yyyy"
-            size="small"
-            @change="fetchData"/>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24" class="chart-body" >
-          <div class="chart-body-title">各类型养护数量统计及占比</div>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12" class="chart-body" >
-          <pie-chart :list="chartList"/>
-        </el-col>
-        <el-col :span="12" class="chart-body">
-          <el-table :data="list" class="table" border style="margin-top: 50px">
-            <el-table-column 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">
-              <template slot-scope="scope">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-      </el-row>
-    </div>
-  </div>
-</template>
-
-<script>
-import { countByYear } 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: 'MaintainStatistics',
-  components: { BarChart, PieChart, DeptSelect },
-  data() {
-    return {
-      listQuery: {
-        year: '',
-        offset: 1,
-        limit: 20,
-        sort: 'count',
-        order: 'desc'
-      },
-      columns: [
-        {
-          text: '养护类型',
-          value: 'typeName',
-          align: 'center'
-        },
-        {
-          text: '养护数量',
-          value: 'count',
-          align: 'center'
-        },
-        {
-          text: '占比',
-          value: 'percent',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      chartList: [],
-      chartshow: false
-    }
-  },
-  watch: {},
-  mounted() {
-    this.fetchData()
-  },
-  activated() {
-    this.fetchData()
-  },
-  methods: {
-    // 获取统计数据
-    fetchData() {
-      console.log('this.fetchData')
-      countByYear(this.listQuery).then(response => {
-        // var data = response.data
-        // for (var i = 0; i < data.length; i++) {
-        //   data[i].num = parseInt(data[i].num)
-        // }
-        this.chartList = response.data.rows
-        this.list = response.data.rows
-      })
-    },
-    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>
-  .app-container{
-    .statistic-container{
-      background-color: #fffffb !important;
-      height: auto;
-      min-height: calc(100vh - 158px);
-      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
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/statistics/pieChart.vue b/src/views/statistics/pieChart.vue
index d69f41a..1012152 100644
--- a/src/views/statistics/pieChart.vue
+++ b/src/views/statistics/pieChart.vue
@@ -1,61 +1,47 @@
 <template>
-  <ve-pie :data="chartData" :legend="legend" :extend="extend" :tooltip="tooltip" :settings="chartSettings"/>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'PieChart',
-  props: {
-    list: {
-      type: Array,
-      default() {
-        return []
+import { countByToilet, countByDay } from '@/api/statistics'
+  export default {
+    name: 'PieChart',
+    data() {
+      this.chartSettings = {
+        labelMap: {
+          'cleanNum': '清洁次数',
+          'staticDate': '时间'
+        },
+        metrics: ['cleanNum'],
+        dimension: ['staticDate']
       }
-    }
-  },
-  data() {
-    this.extend = {
-      // series: {
-      //   label: {
-      //     normarl: { show: true, position: 'outside' }
-      //   }
-      //   // label: { show: true, position: 'right' }
-      // }
-    }
-    this.legend = {
-      bottom: '10px',
-      show: this.baseConfig.showLegend
-    }
-    this.tooltip = {
-      show: true
-    }
-    this.chartSettings = {
-      limitShowNum: this.baseConfig.pieChartLimit,
-      label: {
-        normal: {
-          show: true
+      this.extend = {}
+      return {
+        listQuery: {
+          staticType: '',
+          toiletId: '',
+          startTime: '',
+          endTime: ''
+        },
+        data: {
+          columns: ['staticDate', 'cleanNum'],
+          rows: []
         }
       }
-      // labelMap: {
-      //   'deptName': '单位/部门',
-      //   'num': '记录数'
-      // },
-      // dimension: ['deptName'],
-      // metrics: ['num']
-    }
-    return {
-      chartData: {
-        columns: ['typeName', 'count'],
-        rows: []
+    },
+    methods: {
+      fetchData(params){
+        this.listQuery = params
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+        })
       }
     }
-  },
-  watch: {
-    list(val) {
-      this.chartData.rows = val
-    }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index ff9f9a1..641e1bf 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -31,7 +31,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getDetail } from '@/api/system/bridge'
+import { getDetail } from '@/api/bridge'
 // import icon from '/static/images/well/0100.png'
 // import { getAllMarker } from '@/api/overview'
 // import { getMarkerInfo } from '@/api/marker'
diff --git a/src/views/rule/components/setThresh.vue b/src/views/rule/components/setThresh.vue
deleted file mode 100644
index a0ee404..0000000
--- a/src/views/rule/components/setThresh.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
-      <el-form ref="dataForm" :rules="rules" :model="monitorForm" label-well-code="right" label-width="140px">
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="监控点名称" prop="monitorName">
-              <el-input v-model.trim="monitorForm.monitorName" disabled type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="所属场站" prop="stationName">
-              <el-input v-model="monitorForm.stationName" disabled placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="燃气浓度报警阈值" prop="high">
-              <el-input v-model.trim="monitorForm.high" type="number" :min="0" placeholder="燃气浓度报警阈值"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { setThresh } from '@/api/system/alarm'
-
-export default {
-  name: 'SetThresh',
-  data() {
-    const validateHigh = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('消警持续时间不能为空'))
-      }
-    }
-    return {
-      listLoading: true,
-      dialogFormVisible: false, // 对话框是否显示
-      monitorForm: {
-        stationName: '',
-        monitorId: '',
-        monitorName: '',
-        high: '' // 报警阈值
-      },
-      title: '', // 表头显示标题
-      rules: {
-        high: [{ required: true, validator: validateHigh, trigger: ['change', 'blur'] }]
-      } // 前端校验规则
-    }
-  },
-  watch: { },
-  mounted() { },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, monitorInfo) {
-      debugger
-      this.dialogFormVisible = dialogFormVisible
-      this.title = '设置监控点报警阈值'
-      this.monitorForm.stationName = monitorInfo.stationName
-      this.monitorForm.monitorName = monitorInfo.monitorPointName
-      this.monitorForm.monitorId = monitorInfo.monitorPointId
-      this.monitorForm.high = monitorInfo.high
-    },
-    // 重置表单
-    resetForm() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      // 表单校验
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          setThresh(this.monitorForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('设置成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .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
-    }
-  }
-  .dialog-footer{
-    text-align: right;
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
index a19b9e4..b693382 100644
--- a/src/views/rule/listRule.vue
+++ b/src/views/rule/listRule.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getRuleList } from '@/api/system/rule'
+import { getRuleList } from '@/api/rule'
 // import DownloadTemplate from '@/components/DownloadTemplate'
 
 export default {
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
index 34910e2..b23f51d 100644
--- a/src/views/statistics/barChart.vue
+++ b/src/views/statistics/barChart.vue
@@ -1,51 +1,54 @@
 <template>
   <ve-histogram
     :data="data"
-    :settings="chartSettings"
-    :extend="extend"/>
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'BarChart',
-  props: {
-    data: {
-      type: Object,
-      default() {
-        return {
-          columns: ['typeName', 'count'],
+import { countByToilet, countByDay } from '@/api/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: []
         }
       }
-    }
-  },
-  data() {
-    return {
-      extend: {
-        series: {
-          label: { show: true, position: 'top' },
-          itemStyle: {
-            normal: {
-              barBorderRadius: [3, 3, 0, 0]
-            }
-          },
-          barMaxWidth: 35
+    },
+    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)
+          })
         }
       },
-      chartSettings: {
-        labelMap: {
-          'inoutType': '进出类型',
-          'num': '进出数量'
-        },
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        demension: 'inoutType',
-        barWidth: 15
-      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/maintainStatistics.vue b/src/views/statistics/maintainStatistics.vue
deleted file mode 100644
index a86e235..0000000
--- a/src/views/statistics/maintainStatistics.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="statistic-container">
-      <el-row class="chart-tools">
-        <el-col :span="5" >
-          <el-date-picker
-            v-model="listQuery.year"
-            type="year"
-            placeholder="请选择统计年份"
-            value-format="yyyy"
-            size="small"
-            @change="fetchData"/>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24" class="chart-body" >
-          <div class="chart-body-title">各类型养护数量统计及占比</div>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12" class="chart-body" >
-          <pie-chart :list="chartList"/>
-        </el-col>
-        <el-col :span="12" class="chart-body">
-          <el-table :data="list" class="table" border style="margin-top: 50px">
-            <el-table-column 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">
-              <template slot-scope="scope">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-      </el-row>
-    </div>
-  </div>
-</template>
-
-<script>
-import { countByYear } 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: 'MaintainStatistics',
-  components: { BarChart, PieChart, DeptSelect },
-  data() {
-    return {
-      listQuery: {
-        year: '',
-        offset: 1,
-        limit: 20,
-        sort: 'count',
-        order: 'desc'
-      },
-      columns: [
-        {
-          text: '养护类型',
-          value: 'typeName',
-          align: 'center'
-        },
-        {
-          text: '养护数量',
-          value: 'count',
-          align: 'center'
-        },
-        {
-          text: '占比',
-          value: 'percent',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      chartList: [],
-      chartshow: false
-    }
-  },
-  watch: {},
-  mounted() {
-    this.fetchData()
-  },
-  activated() {
-    this.fetchData()
-  },
-  methods: {
-    // 获取统计数据
-    fetchData() {
-      console.log('this.fetchData')
-      countByYear(this.listQuery).then(response => {
-        // var data = response.data
-        // for (var i = 0; i < data.length; i++) {
-        //   data[i].num = parseInt(data[i].num)
-        // }
-        this.chartList = response.data.rows
-        this.list = response.data.rows
-      })
-    },
-    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>
-  .app-container{
-    .statistic-container{
-      background-color: #fffffb !important;
-      height: auto;
-      min-height: calc(100vh - 158px);
-      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
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/statistics/pieChart.vue b/src/views/statistics/pieChart.vue
index d69f41a..1012152 100644
--- a/src/views/statistics/pieChart.vue
+++ b/src/views/statistics/pieChart.vue
@@ -1,61 +1,47 @@
 <template>
-  <ve-pie :data="chartData" :legend="legend" :extend="extend" :tooltip="tooltip" :settings="chartSettings"/>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'PieChart',
-  props: {
-    list: {
-      type: Array,
-      default() {
-        return []
+import { countByToilet, countByDay } from '@/api/statistics'
+  export default {
+    name: 'PieChart',
+    data() {
+      this.chartSettings = {
+        labelMap: {
+          'cleanNum': '清洁次数',
+          'staticDate': '时间'
+        },
+        metrics: ['cleanNum'],
+        dimension: ['staticDate']
       }
-    }
-  },
-  data() {
-    this.extend = {
-      // series: {
-      //   label: {
-      //     normarl: { show: true, position: 'outside' }
-      //   }
-      //   // label: { show: true, position: 'right' }
-      // }
-    }
-    this.legend = {
-      bottom: '10px',
-      show: this.baseConfig.showLegend
-    }
-    this.tooltip = {
-      show: true
-    }
-    this.chartSettings = {
-      limitShowNum: this.baseConfig.pieChartLimit,
-      label: {
-        normal: {
-          show: true
+      this.extend = {}
+      return {
+        listQuery: {
+          staticType: '',
+          toiletId: '',
+          startTime: '',
+          endTime: ''
+        },
+        data: {
+          columns: ['staticDate', 'cleanNum'],
+          rows: []
         }
       }
-      // labelMap: {
-      //   'deptName': '单位/部门',
-      //   'num': '记录数'
-      // },
-      // dimension: ['deptName'],
-      // metrics: ['num']
-    }
-    return {
-      chartData: {
-        columns: ['typeName', 'count'],
-        rows: []
+    },
+    methods: {
+      fetchData(params){
+        this.listQuery = params
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+        })
       }
     }
-  },
-  watch: {
-    list(val) {
-      this.chartData.rows = val
-    }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..7d3e329
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="app-container">
+      <div class="statistic-container">
+        <el-row class="chart-tools">
+          <el-col :span="5" >
+            <el-date-picker
+              v-model="year"
+              type="year"
+              placeholder="请选择统计年份"
+              value-format="yyyy"
+              size="small"
+              @change="fetchData1"/>
+          </el-col>
+          <el-col :span="5">
+            <el-date-picker
+              v-model="month"
+              type="month"
+              placeholder="请选择统计年月"
+              value-format="yyyy-MM"
+              size="small"
+              @change="fetchData1"/>
+          </el-col>
+          <el-col :span="5">
+            <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>
+          </el-col>
+        </el-row>
+        <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>
+  </div>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/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>
+  .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
+        }
+      }
+    }
+  }
+</style>

diff --git a/src/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index ff9f9a1..641e1bf 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -31,7 +31,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getDetail } from '@/api/system/bridge'
+import { getDetail } from '@/api/bridge'
 // import icon from '/static/images/well/0100.png'
 // import { getAllMarker } from '@/api/overview'
 // import { getMarkerInfo } from '@/api/marker'
diff --git a/src/views/rule/components/setThresh.vue b/src/views/rule/components/setThresh.vue
deleted file mode 100644
index a0ee404..0000000
--- a/src/views/rule/components/setThresh.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
-      <el-form ref="dataForm" :rules="rules" :model="monitorForm" label-well-code="right" label-width="140px">
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="监控点名称" prop="monitorName">
-              <el-input v-model.trim="monitorForm.monitorName" disabled type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="所属场站" prop="stationName">
-              <el-input v-model="monitorForm.stationName" disabled placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="燃气浓度报警阈值" prop="high">
-              <el-input v-model.trim="monitorForm.high" type="number" :min="0" placeholder="燃气浓度报警阈值"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { setThresh } from '@/api/system/alarm'
-
-export default {
-  name: 'SetThresh',
-  data() {
-    const validateHigh = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('消警持续时间不能为空'))
-      }
-    }
-    return {
-      listLoading: true,
-      dialogFormVisible: false, // 对话框是否显示
-      monitorForm: {
-        stationName: '',
-        monitorId: '',
-        monitorName: '',
-        high: '' // 报警阈值
-      },
-      title: '', // 表头显示标题
-      rules: {
-        high: [{ required: true, validator: validateHigh, trigger: ['change', 'blur'] }]
-      } // 前端校验规则
-    }
-  },
-  watch: { },
-  mounted() { },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, monitorInfo) {
-      debugger
-      this.dialogFormVisible = dialogFormVisible
-      this.title = '设置监控点报警阈值'
-      this.monitorForm.stationName = monitorInfo.stationName
-      this.monitorForm.monitorName = monitorInfo.monitorPointName
-      this.monitorForm.monitorId = monitorInfo.monitorPointId
-      this.monitorForm.high = monitorInfo.high
-    },
-    // 重置表单
-    resetForm() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      // 表单校验
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          setThresh(this.monitorForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('设置成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .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
-    }
-  }
-  .dialog-footer{
-    text-align: right;
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
index a19b9e4..b693382 100644
--- a/src/views/rule/listRule.vue
+++ b/src/views/rule/listRule.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getRuleList } from '@/api/system/rule'
+import { getRuleList } from '@/api/rule'
 // import DownloadTemplate from '@/components/DownloadTemplate'
 
 export default {
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
index 34910e2..b23f51d 100644
--- a/src/views/statistics/barChart.vue
+++ b/src/views/statistics/barChart.vue
@@ -1,51 +1,54 @@
 <template>
   <ve-histogram
     :data="data"
-    :settings="chartSettings"
-    :extend="extend"/>
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'BarChart',
-  props: {
-    data: {
-      type: Object,
-      default() {
-        return {
-          columns: ['typeName', 'count'],
+import { countByToilet, countByDay } from '@/api/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: []
         }
       }
-    }
-  },
-  data() {
-    return {
-      extend: {
-        series: {
-          label: { show: true, position: 'top' },
-          itemStyle: {
-            normal: {
-              barBorderRadius: [3, 3, 0, 0]
-            }
-          },
-          barMaxWidth: 35
+    },
+    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)
+          })
         }
       },
-      chartSettings: {
-        labelMap: {
-          'inoutType': '进出类型',
-          'num': '进出数量'
-        },
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        demension: 'inoutType',
-        barWidth: 15
-      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/maintainStatistics.vue b/src/views/statistics/maintainStatistics.vue
deleted file mode 100644
index a86e235..0000000
--- a/src/views/statistics/maintainStatistics.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="statistic-container">
-      <el-row class="chart-tools">
-        <el-col :span="5" >
-          <el-date-picker
-            v-model="listQuery.year"
-            type="year"
-            placeholder="请选择统计年份"
-            value-format="yyyy"
-            size="small"
-            @change="fetchData"/>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24" class="chart-body" >
-          <div class="chart-body-title">各类型养护数量统计及占比</div>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12" class="chart-body" >
-          <pie-chart :list="chartList"/>
-        </el-col>
-        <el-col :span="12" class="chart-body">
-          <el-table :data="list" class="table" border style="margin-top: 50px">
-            <el-table-column 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">
-              <template slot-scope="scope">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-      </el-row>
-    </div>
-  </div>
-</template>
-
-<script>
-import { countByYear } 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: 'MaintainStatistics',
-  components: { BarChart, PieChart, DeptSelect },
-  data() {
-    return {
-      listQuery: {
-        year: '',
-        offset: 1,
-        limit: 20,
-        sort: 'count',
-        order: 'desc'
-      },
-      columns: [
-        {
-          text: '养护类型',
-          value: 'typeName',
-          align: 'center'
-        },
-        {
-          text: '养护数量',
-          value: 'count',
-          align: 'center'
-        },
-        {
-          text: '占比',
-          value: 'percent',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      chartList: [],
-      chartshow: false
-    }
-  },
-  watch: {},
-  mounted() {
-    this.fetchData()
-  },
-  activated() {
-    this.fetchData()
-  },
-  methods: {
-    // 获取统计数据
-    fetchData() {
-      console.log('this.fetchData')
-      countByYear(this.listQuery).then(response => {
-        // var data = response.data
-        // for (var i = 0; i < data.length; i++) {
-        //   data[i].num = parseInt(data[i].num)
-        // }
-        this.chartList = response.data.rows
-        this.list = response.data.rows
-      })
-    },
-    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>
-  .app-container{
-    .statistic-container{
-      background-color: #fffffb !important;
-      height: auto;
-      min-height: calc(100vh - 158px);
-      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
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/statistics/pieChart.vue b/src/views/statistics/pieChart.vue
index d69f41a..1012152 100644
--- a/src/views/statistics/pieChart.vue
+++ b/src/views/statistics/pieChart.vue
@@ -1,61 +1,47 @@
 <template>
-  <ve-pie :data="chartData" :legend="legend" :extend="extend" :tooltip="tooltip" :settings="chartSettings"/>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'PieChart',
-  props: {
-    list: {
-      type: Array,
-      default() {
-        return []
+import { countByToilet, countByDay } from '@/api/statistics'
+  export default {
+    name: 'PieChart',
+    data() {
+      this.chartSettings = {
+        labelMap: {
+          'cleanNum': '清洁次数',
+          'staticDate': '时间'
+        },
+        metrics: ['cleanNum'],
+        dimension: ['staticDate']
       }
-    }
-  },
-  data() {
-    this.extend = {
-      // series: {
-      //   label: {
-      //     normarl: { show: true, position: 'outside' }
-      //   }
-      //   // label: { show: true, position: 'right' }
-      // }
-    }
-    this.legend = {
-      bottom: '10px',
-      show: this.baseConfig.showLegend
-    }
-    this.tooltip = {
-      show: true
-    }
-    this.chartSettings = {
-      limitShowNum: this.baseConfig.pieChartLimit,
-      label: {
-        normal: {
-          show: true
+      this.extend = {}
+      return {
+        listQuery: {
+          staticType: '',
+          toiletId: '',
+          startTime: '',
+          endTime: ''
+        },
+        data: {
+          columns: ['staticDate', 'cleanNum'],
+          rows: []
         }
       }
-      // labelMap: {
-      //   'deptName': '单位/部门',
-      //   'num': '记录数'
-      // },
-      // dimension: ['deptName'],
-      // metrics: ['num']
-    }
-    return {
-      chartData: {
-        columns: ['typeName', 'count'],
-        rows: []
+    },
+    methods: {
+      fetchData(params){
+        this.listQuery = params
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+        })
       }
     }
-  },
-  watch: {
-    list(val) {
-      this.chartData.rows = val
-    }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..7d3e329
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="app-container">
+      <div class="statistic-container">
+        <el-row class="chart-tools">
+          <el-col :span="5" >
+            <el-date-picker
+              v-model="year"
+              type="year"
+              placeholder="请选择统计年份"
+              value-format="yyyy"
+              size="small"
+              @change="fetchData1"/>
+          </el-col>
+          <el-col :span="5">
+            <el-date-picker
+              v-model="month"
+              type="month"
+              placeholder="请选择统计年月"
+              value-format="yyyy-MM"
+              size="small"
+              @change="fetchData1"/>
+          </el-col>
+          <el-col :span="5">
+            <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>
+          </el-col>
+        </el-row>
+        <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>
+  </div>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/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>
+  .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
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..89f2815
--- /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/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/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index ff9f9a1..641e1bf 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -31,7 +31,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getDetail } from '@/api/system/bridge'
+import { getDetail } from '@/api/bridge'
 // import icon from '/static/images/well/0100.png'
 // import { getAllMarker } from '@/api/overview'
 // import { getMarkerInfo } from '@/api/marker'
diff --git a/src/views/rule/components/setThresh.vue b/src/views/rule/components/setThresh.vue
deleted file mode 100644
index a0ee404..0000000
--- a/src/views/rule/components/setThresh.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
-      <el-form ref="dataForm" :rules="rules" :model="monitorForm" label-well-code="right" label-width="140px">
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="监控点名称" prop="monitorName">
-              <el-input v-model.trim="monitorForm.monitorName" disabled type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="所属场站" prop="stationName">
-              <el-input v-model="monitorForm.stationName" disabled placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="燃气浓度报警阈值" prop="high">
-              <el-input v-model.trim="monitorForm.high" type="number" :min="0" placeholder="燃气浓度报警阈值"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { setThresh } from '@/api/system/alarm'
-
-export default {
-  name: 'SetThresh',
-  data() {
-    const validateHigh = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('消警持续时间不能为空'))
-      }
-    }
-    return {
-      listLoading: true,
-      dialogFormVisible: false, // 对话框是否显示
-      monitorForm: {
-        stationName: '',
-        monitorId: '',
-        monitorName: '',
-        high: '' // 报警阈值
-      },
-      title: '', // 表头显示标题
-      rules: {
-        high: [{ required: true, validator: validateHigh, trigger: ['change', 'blur'] }]
-      } // 前端校验规则
-    }
-  },
-  watch: { },
-  mounted() { },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, monitorInfo) {
-      debugger
-      this.dialogFormVisible = dialogFormVisible
-      this.title = '设置监控点报警阈值'
-      this.monitorForm.stationName = monitorInfo.stationName
-      this.monitorForm.monitorName = monitorInfo.monitorPointName
-      this.monitorForm.monitorId = monitorInfo.monitorPointId
-      this.monitorForm.high = monitorInfo.high
-    },
-    // 重置表单
-    resetForm() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      // 表单校验
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          setThresh(this.monitorForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('设置成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .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
-    }
-  }
-  .dialog-footer{
-    text-align: right;
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
index a19b9e4..b693382 100644
--- a/src/views/rule/listRule.vue
+++ b/src/views/rule/listRule.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getRuleList } from '@/api/system/rule'
+import { getRuleList } from '@/api/rule'
 // import DownloadTemplate from '@/components/DownloadTemplate'
 
 export default {
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
index 34910e2..b23f51d 100644
--- a/src/views/statistics/barChart.vue
+++ b/src/views/statistics/barChart.vue
@@ -1,51 +1,54 @@
 <template>
   <ve-histogram
     :data="data"
-    :settings="chartSettings"
-    :extend="extend"/>
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'BarChart',
-  props: {
-    data: {
-      type: Object,
-      default() {
-        return {
-          columns: ['typeName', 'count'],
+import { countByToilet, countByDay } from '@/api/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: []
         }
       }
-    }
-  },
-  data() {
-    return {
-      extend: {
-        series: {
-          label: { show: true, position: 'top' },
-          itemStyle: {
-            normal: {
-              barBorderRadius: [3, 3, 0, 0]
-            }
-          },
-          barMaxWidth: 35
+    },
+    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)
+          })
         }
       },
-      chartSettings: {
-        labelMap: {
-          'inoutType': '进出类型',
-          'num': '进出数量'
-        },
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        demension: 'inoutType',
-        barWidth: 15
-      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/maintainStatistics.vue b/src/views/statistics/maintainStatistics.vue
deleted file mode 100644
index a86e235..0000000
--- a/src/views/statistics/maintainStatistics.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="statistic-container">
-      <el-row class="chart-tools">
-        <el-col :span="5" >
-          <el-date-picker
-            v-model="listQuery.year"
-            type="year"
-            placeholder="请选择统计年份"
-            value-format="yyyy"
-            size="small"
-            @change="fetchData"/>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24" class="chart-body" >
-          <div class="chart-body-title">各类型养护数量统计及占比</div>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12" class="chart-body" >
-          <pie-chart :list="chartList"/>
-        </el-col>
-        <el-col :span="12" class="chart-body">
-          <el-table :data="list" class="table" border style="margin-top: 50px">
-            <el-table-column 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">
-              <template slot-scope="scope">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-      </el-row>
-    </div>
-  </div>
-</template>
-
-<script>
-import { countByYear } 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: 'MaintainStatistics',
-  components: { BarChart, PieChart, DeptSelect },
-  data() {
-    return {
-      listQuery: {
-        year: '',
-        offset: 1,
-        limit: 20,
-        sort: 'count',
-        order: 'desc'
-      },
-      columns: [
-        {
-          text: '养护类型',
-          value: 'typeName',
-          align: 'center'
-        },
-        {
-          text: '养护数量',
-          value: 'count',
-          align: 'center'
-        },
-        {
-          text: '占比',
-          value: 'percent',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      chartList: [],
-      chartshow: false
-    }
-  },
-  watch: {},
-  mounted() {
-    this.fetchData()
-  },
-  activated() {
-    this.fetchData()
-  },
-  methods: {
-    // 获取统计数据
-    fetchData() {
-      console.log('this.fetchData')
-      countByYear(this.listQuery).then(response => {
-        // var data = response.data
-        // for (var i = 0; i < data.length; i++) {
-        //   data[i].num = parseInt(data[i].num)
-        // }
-        this.chartList = response.data.rows
-        this.list = response.data.rows
-      })
-    },
-    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>
-  .app-container{
-    .statistic-container{
-      background-color: #fffffb !important;
-      height: auto;
-      min-height: calc(100vh - 158px);
-      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
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/statistics/pieChart.vue b/src/views/statistics/pieChart.vue
index d69f41a..1012152 100644
--- a/src/views/statistics/pieChart.vue
+++ b/src/views/statistics/pieChart.vue
@@ -1,61 +1,47 @@
 <template>
-  <ve-pie :data="chartData" :legend="legend" :extend="extend" :tooltip="tooltip" :settings="chartSettings"/>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'PieChart',
-  props: {
-    list: {
-      type: Array,
-      default() {
-        return []
+import { countByToilet, countByDay } from '@/api/statistics'
+  export default {
+    name: 'PieChart',
+    data() {
+      this.chartSettings = {
+        labelMap: {
+          'cleanNum': '清洁次数',
+          'staticDate': '时间'
+        },
+        metrics: ['cleanNum'],
+        dimension: ['staticDate']
       }
-    }
-  },
-  data() {
-    this.extend = {
-      // series: {
-      //   label: {
-      //     normarl: { show: true, position: 'outside' }
-      //   }
-      //   // label: { show: true, position: 'right' }
-      // }
-    }
-    this.legend = {
-      bottom: '10px',
-      show: this.baseConfig.showLegend
-    }
-    this.tooltip = {
-      show: true
-    }
-    this.chartSettings = {
-      limitShowNum: this.baseConfig.pieChartLimit,
-      label: {
-        normal: {
-          show: true
+      this.extend = {}
+      return {
+        listQuery: {
+          staticType: '',
+          toiletId: '',
+          startTime: '',
+          endTime: ''
+        },
+        data: {
+          columns: ['staticDate', 'cleanNum'],
+          rows: []
         }
       }
-      // labelMap: {
-      //   'deptName': '单位/部门',
-      //   'num': '记录数'
-      // },
-      // dimension: ['deptName'],
-      // metrics: ['num']
-    }
-    return {
-      chartData: {
-        columns: ['typeName', 'count'],
-        rows: []
+    },
+    methods: {
+      fetchData(params){
+        this.listQuery = params
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+        })
       }
     }
-  },
-  watch: {
-    list(val) {
-      this.chartData.rows = val
-    }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..7d3e329
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="app-container">
+      <div class="statistic-container">
+        <el-row class="chart-tools">
+          <el-col :span="5" >
+            <el-date-picker
+              v-model="year"
+              type="year"
+              placeholder="请选择统计年份"
+              value-format="yyyy"
+              size="small"
+              @change="fetchData1"/>
+          </el-col>
+          <el-col :span="5">
+            <el-date-picker
+              v-model="month"
+              type="month"
+              placeholder="请选择统计年月"
+              value-format="yyyy-MM"
+              size="small"
+              @change="fetchData1"/>
+          </el-col>
+          <el-col :span="5">
+            <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>
+          </el-col>
+        </el-row>
+        <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>
+  </div>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/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>
+  .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
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..89f2815
--- /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/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..a7caa86
--- /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/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/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index ff9f9a1..641e1bf 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -31,7 +31,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getDetail } from '@/api/system/bridge'
+import { getDetail } from '@/api/bridge'
 // import icon from '/static/images/well/0100.png'
 // import { getAllMarker } from '@/api/overview'
 // import { getMarkerInfo } from '@/api/marker'
diff --git a/src/views/rule/components/setThresh.vue b/src/views/rule/components/setThresh.vue
deleted file mode 100644
index a0ee404..0000000
--- a/src/views/rule/components/setThresh.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
-      <el-form ref="dataForm" :rules="rules" :model="monitorForm" label-well-code="right" label-width="140px">
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="监控点名称" prop="monitorName">
-              <el-input v-model.trim="monitorForm.monitorName" disabled type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="所属场站" prop="stationName">
-              <el-input v-model="monitorForm.stationName" disabled placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="燃气浓度报警阈值" prop="high">
-              <el-input v-model.trim="monitorForm.high" type="number" :min="0" placeholder="燃气浓度报警阈值"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { setThresh } from '@/api/system/alarm'
-
-export default {
-  name: 'SetThresh',
-  data() {
-    const validateHigh = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('消警持续时间不能为空'))
-      }
-    }
-    return {
-      listLoading: true,
-      dialogFormVisible: false, // 对话框是否显示
-      monitorForm: {
-        stationName: '',
-        monitorId: '',
-        monitorName: '',
-        high: '' // 报警阈值
-      },
-      title: '', // 表头显示标题
-      rules: {
-        high: [{ required: true, validator: validateHigh, trigger: ['change', 'blur'] }]
-      } // 前端校验规则
-    }
-  },
-  watch: { },
-  mounted() { },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, monitorInfo) {
-      debugger
-      this.dialogFormVisible = dialogFormVisible
-      this.title = '设置监控点报警阈值'
-      this.monitorForm.stationName = monitorInfo.stationName
-      this.monitorForm.monitorName = monitorInfo.monitorPointName
-      this.monitorForm.monitorId = monitorInfo.monitorPointId
-      this.monitorForm.high = monitorInfo.high
-    },
-    // 重置表单
-    resetForm() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      // 表单校验
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          setThresh(this.monitorForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('设置成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .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
-    }
-  }
-  .dialog-footer{
-    text-align: right;
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
index a19b9e4..b693382 100644
--- a/src/views/rule/listRule.vue
+++ b/src/views/rule/listRule.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getRuleList } from '@/api/system/rule'
+import { getRuleList } from '@/api/rule'
 // import DownloadTemplate from '@/components/DownloadTemplate'
 
 export default {
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
index 34910e2..b23f51d 100644
--- a/src/views/statistics/barChart.vue
+++ b/src/views/statistics/barChart.vue
@@ -1,51 +1,54 @@
 <template>
   <ve-histogram
     :data="data"
-    :settings="chartSettings"
-    :extend="extend"/>
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'BarChart',
-  props: {
-    data: {
-      type: Object,
-      default() {
-        return {
-          columns: ['typeName', 'count'],
+import { countByToilet, countByDay } from '@/api/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: []
         }
       }
-    }
-  },
-  data() {
-    return {
-      extend: {
-        series: {
-          label: { show: true, position: 'top' },
-          itemStyle: {
-            normal: {
-              barBorderRadius: [3, 3, 0, 0]
-            }
-          },
-          barMaxWidth: 35
+    },
+    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)
+          })
         }
       },
-      chartSettings: {
-        labelMap: {
-          'inoutType': '进出类型',
-          'num': '进出数量'
-        },
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        demension: 'inoutType',
-        barWidth: 15
-      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/maintainStatistics.vue b/src/views/statistics/maintainStatistics.vue
deleted file mode 100644
index a86e235..0000000
--- a/src/views/statistics/maintainStatistics.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="statistic-container">
-      <el-row class="chart-tools">
-        <el-col :span="5" >
-          <el-date-picker
-            v-model="listQuery.year"
-            type="year"
-            placeholder="请选择统计年份"
-            value-format="yyyy"
-            size="small"
-            @change="fetchData"/>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24" class="chart-body" >
-          <div class="chart-body-title">各类型养护数量统计及占比</div>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12" class="chart-body" >
-          <pie-chart :list="chartList"/>
-        </el-col>
-        <el-col :span="12" class="chart-body">
-          <el-table :data="list" class="table" border style="margin-top: 50px">
-            <el-table-column 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">
-              <template slot-scope="scope">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-      </el-row>
-    </div>
-  </div>
-</template>
-
-<script>
-import { countByYear } 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: 'MaintainStatistics',
-  components: { BarChart, PieChart, DeptSelect },
-  data() {
-    return {
-      listQuery: {
-        year: '',
-        offset: 1,
-        limit: 20,
-        sort: 'count',
-        order: 'desc'
-      },
-      columns: [
-        {
-          text: '养护类型',
-          value: 'typeName',
-          align: 'center'
-        },
-        {
-          text: '养护数量',
-          value: 'count',
-          align: 'center'
-        },
-        {
-          text: '占比',
-          value: 'percent',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      chartList: [],
-      chartshow: false
-    }
-  },
-  watch: {},
-  mounted() {
-    this.fetchData()
-  },
-  activated() {
-    this.fetchData()
-  },
-  methods: {
-    // 获取统计数据
-    fetchData() {
-      console.log('this.fetchData')
-      countByYear(this.listQuery).then(response => {
-        // var data = response.data
-        // for (var i = 0; i < data.length; i++) {
-        //   data[i].num = parseInt(data[i].num)
-        // }
-        this.chartList = response.data.rows
-        this.list = response.data.rows
-      })
-    },
-    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>
-  .app-container{
-    .statistic-container{
-      background-color: #fffffb !important;
-      height: auto;
-      min-height: calc(100vh - 158px);
-      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
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/statistics/pieChart.vue b/src/views/statistics/pieChart.vue
index d69f41a..1012152 100644
--- a/src/views/statistics/pieChart.vue
+++ b/src/views/statistics/pieChart.vue
@@ -1,61 +1,47 @@
 <template>
-  <ve-pie :data="chartData" :legend="legend" :extend="extend" :tooltip="tooltip" :settings="chartSettings"/>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'PieChart',
-  props: {
-    list: {
-      type: Array,
-      default() {
-        return []
+import { countByToilet, countByDay } from '@/api/statistics'
+  export default {
+    name: 'PieChart',
+    data() {
+      this.chartSettings = {
+        labelMap: {
+          'cleanNum': '清洁次数',
+          'staticDate': '时间'
+        },
+        metrics: ['cleanNum'],
+        dimension: ['staticDate']
       }
-    }
-  },
-  data() {
-    this.extend = {
-      // series: {
-      //   label: {
-      //     normarl: { show: true, position: 'outside' }
-      //   }
-      //   // label: { show: true, position: 'right' }
-      // }
-    }
-    this.legend = {
-      bottom: '10px',
-      show: this.baseConfig.showLegend
-    }
-    this.tooltip = {
-      show: true
-    }
-    this.chartSettings = {
-      limitShowNum: this.baseConfig.pieChartLimit,
-      label: {
-        normal: {
-          show: true
+      this.extend = {}
+      return {
+        listQuery: {
+          staticType: '',
+          toiletId: '',
+          startTime: '',
+          endTime: ''
+        },
+        data: {
+          columns: ['staticDate', 'cleanNum'],
+          rows: []
         }
       }
-      // labelMap: {
-      //   'deptName': '单位/部门',
-      //   'num': '记录数'
-      // },
-      // dimension: ['deptName'],
-      // metrics: ['num']
-    }
-    return {
-      chartData: {
-        columns: ['typeName', 'count'],
-        rows: []
+    },
+    methods: {
+      fetchData(params){
+        this.listQuery = params
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+        })
       }
     }
-  },
-  watch: {
-    list(val) {
-      this.chartData.rows = val
-    }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..7d3e329
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="app-container">
+      <div class="statistic-container">
+        <el-row class="chart-tools">
+          <el-col :span="5" >
+            <el-date-picker
+              v-model="year"
+              type="year"
+              placeholder="请选择统计年份"
+              value-format="yyyy"
+              size="small"
+              @change="fetchData1"/>
+          </el-col>
+          <el-col :span="5">
+            <el-date-picker
+              v-model="month"
+              type="month"
+              placeholder="请选择统计年月"
+              value-format="yyyy-MM"
+              size="small"
+              @change="fetchData1"/>
+          </el-col>
+          <el-col :span="5">
+            <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>
+          </el-col>
+        </el-row>
+        <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>
+  </div>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/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>
+  .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
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..89f2815
--- /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/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..a7caa86
--- /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/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..266ee8d
--- /dev/null
+++ b/src/views/toilet/listToilet.vue
@@ -0,0 +1,249 @@
+<template>
+  <div class="app-container">
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-form-item prop="keywords">
+          <el-input v-model.trim="listQuery.keywords" placeholder="公厕编号/名称" clearable/>
+        </el-form-item>
+        <el-form-item prop="owner">
+          <el-input v-model.trim="listQuery.owner" placeholder="建设单位" clearable/>
+        </el-form-item>
+        <el-form-item prop="position">
+          <el-input v-model.trim="listQuery.position" placeholder="位置" clearable/>
+        </el-form-item>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>
+        <!--</el-row>-->
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+        </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">
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="210" align="center">
+          <template slot-scope="scope">
+            <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
+            <el-button type="warning" size="mini" @click="edit(scope.row)">编辑</el-button>
+            <el-button type="danger" size="mini" @click="del(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>
+    <edit-toilet v-show="editShow" ref="edittoilet" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import { getToiletList, delToilet } from '@/api/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 // 是否显示编辑框
+    }
+  },
+  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/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index ff9f9a1..641e1bf 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -31,7 +31,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getDetail } from '@/api/system/bridge'
+import { getDetail } from '@/api/bridge'
 // import icon from '/static/images/well/0100.png'
 // import { getAllMarker } from '@/api/overview'
 // import { getMarkerInfo } from '@/api/marker'
diff --git a/src/views/rule/components/setThresh.vue b/src/views/rule/components/setThresh.vue
deleted file mode 100644
index a0ee404..0000000
--- a/src/views/rule/components/setThresh.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
-      <el-form ref="dataForm" :rules="rules" :model="monitorForm" label-well-code="right" label-width="140px">
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="监控点名称" prop="monitorName">
-              <el-input v-model.trim="monitorForm.monitorName" disabled type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="所属场站" prop="stationName">
-              <el-input v-model="monitorForm.stationName" disabled placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="燃气浓度报警阈值" prop="high">
-              <el-input v-model.trim="monitorForm.high" type="number" :min="0" placeholder="燃气浓度报警阈值"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { setThresh } from '@/api/system/alarm'
-
-export default {
-  name: 'SetThresh',
-  data() {
-    const validateHigh = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('消警持续时间不能为空'))
-      }
-    }
-    return {
-      listLoading: true,
-      dialogFormVisible: false, // 对话框是否显示
-      monitorForm: {
-        stationName: '',
-        monitorId: '',
-        monitorName: '',
-        high: '' // 报警阈值
-      },
-      title: '', // 表头显示标题
-      rules: {
-        high: [{ required: true, validator: validateHigh, trigger: ['change', 'blur'] }]
-      } // 前端校验规则
-    }
-  },
-  watch: { },
-  mounted() { },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, monitorInfo) {
-      debugger
-      this.dialogFormVisible = dialogFormVisible
-      this.title = '设置监控点报警阈值'
-      this.monitorForm.stationName = monitorInfo.stationName
-      this.monitorForm.monitorName = monitorInfo.monitorPointName
-      this.monitorForm.monitorId = monitorInfo.monitorPointId
-      this.monitorForm.high = monitorInfo.high
-    },
-    // 重置表单
-    resetForm() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      // 表单校验
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          setThresh(this.monitorForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('设置成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .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
-    }
-  }
-  .dialog-footer{
-    text-align: right;
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
index a19b9e4..b693382 100644
--- a/src/views/rule/listRule.vue
+++ b/src/views/rule/listRule.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getRuleList } from '@/api/system/rule'
+import { getRuleList } from '@/api/rule'
 // import DownloadTemplate from '@/components/DownloadTemplate'
 
 export default {
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
index 34910e2..b23f51d 100644
--- a/src/views/statistics/barChart.vue
+++ b/src/views/statistics/barChart.vue
@@ -1,51 +1,54 @@
 <template>
   <ve-histogram
     :data="data"
-    :settings="chartSettings"
-    :extend="extend"/>
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'BarChart',
-  props: {
-    data: {
-      type: Object,
-      default() {
-        return {
-          columns: ['typeName', 'count'],
+import { countByToilet, countByDay } from '@/api/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: []
         }
       }
-    }
-  },
-  data() {
-    return {
-      extend: {
-        series: {
-          label: { show: true, position: 'top' },
-          itemStyle: {
-            normal: {
-              barBorderRadius: [3, 3, 0, 0]
-            }
-          },
-          barMaxWidth: 35
+    },
+    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)
+          })
         }
       },
-      chartSettings: {
-        labelMap: {
-          'inoutType': '进出类型',
-          'num': '进出数量'
-        },
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        demension: 'inoutType',
-        barWidth: 15
-      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/maintainStatistics.vue b/src/views/statistics/maintainStatistics.vue
deleted file mode 100644
index a86e235..0000000
--- a/src/views/statistics/maintainStatistics.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="statistic-container">
-      <el-row class="chart-tools">
-        <el-col :span="5" >
-          <el-date-picker
-            v-model="listQuery.year"
-            type="year"
-            placeholder="请选择统计年份"
-            value-format="yyyy"
-            size="small"
-            @change="fetchData"/>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24" class="chart-body" >
-          <div class="chart-body-title">各类型养护数量统计及占比</div>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12" class="chart-body" >
-          <pie-chart :list="chartList"/>
-        </el-col>
-        <el-col :span="12" class="chart-body">
-          <el-table :data="list" class="table" border style="margin-top: 50px">
-            <el-table-column 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">
-              <template slot-scope="scope">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-      </el-row>
-    </div>
-  </div>
-</template>
-
-<script>
-import { countByYear } 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: 'MaintainStatistics',
-  components: { BarChart, PieChart, DeptSelect },
-  data() {
-    return {
-      listQuery: {
-        year: '',
-        offset: 1,
-        limit: 20,
-        sort: 'count',
-        order: 'desc'
-      },
-      columns: [
-        {
-          text: '养护类型',
-          value: 'typeName',
-          align: 'center'
-        },
-        {
-          text: '养护数量',
-          value: 'count',
-          align: 'center'
-        },
-        {
-          text: '占比',
-          value: 'percent',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      chartList: [],
-      chartshow: false
-    }
-  },
-  watch: {},
-  mounted() {
-    this.fetchData()
-  },
-  activated() {
-    this.fetchData()
-  },
-  methods: {
-    // 获取统计数据
-    fetchData() {
-      console.log('this.fetchData')
-      countByYear(this.listQuery).then(response => {
-        // var data = response.data
-        // for (var i = 0; i < data.length; i++) {
-        //   data[i].num = parseInt(data[i].num)
-        // }
-        this.chartList = response.data.rows
-        this.list = response.data.rows
-      })
-    },
-    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>
-  .app-container{
-    .statistic-container{
-      background-color: #fffffb !important;
-      height: auto;
-      min-height: calc(100vh - 158px);
-      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
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/statistics/pieChart.vue b/src/views/statistics/pieChart.vue
index d69f41a..1012152 100644
--- a/src/views/statistics/pieChart.vue
+++ b/src/views/statistics/pieChart.vue
@@ -1,61 +1,47 @@
 <template>
-  <ve-pie :data="chartData" :legend="legend" :extend="extend" :tooltip="tooltip" :settings="chartSettings"/>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'PieChart',
-  props: {
-    list: {
-      type: Array,
-      default() {
-        return []
+import { countByToilet, countByDay } from '@/api/statistics'
+  export default {
+    name: 'PieChart',
+    data() {
+      this.chartSettings = {
+        labelMap: {
+          'cleanNum': '清洁次数',
+          'staticDate': '时间'
+        },
+        metrics: ['cleanNum'],
+        dimension: ['staticDate']
       }
-    }
-  },
-  data() {
-    this.extend = {
-      // series: {
-      //   label: {
-      //     normarl: { show: true, position: 'outside' }
-      //   }
-      //   // label: { show: true, position: 'right' }
-      // }
-    }
-    this.legend = {
-      bottom: '10px',
-      show: this.baseConfig.showLegend
-    }
-    this.tooltip = {
-      show: true
-    }
-    this.chartSettings = {
-      limitShowNum: this.baseConfig.pieChartLimit,
-      label: {
-        normal: {
-          show: true
+      this.extend = {}
+      return {
+        listQuery: {
+          staticType: '',
+          toiletId: '',
+          startTime: '',
+          endTime: ''
+        },
+        data: {
+          columns: ['staticDate', 'cleanNum'],
+          rows: []
         }
       }
-      // labelMap: {
-      //   'deptName': '单位/部门',
-      //   'num': '记录数'
-      // },
-      // dimension: ['deptName'],
-      // metrics: ['num']
-    }
-    return {
-      chartData: {
-        columns: ['typeName', 'count'],
-        rows: []
+    },
+    methods: {
+      fetchData(params){
+        this.listQuery = params
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+        })
       }
     }
-  },
-  watch: {
-    list(val) {
-      this.chartData.rows = val
-    }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..7d3e329
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="app-container">
+      <div class="statistic-container">
+        <el-row class="chart-tools">
+          <el-col :span="5" >
+            <el-date-picker
+              v-model="year"
+              type="year"
+              placeholder="请选择统计年份"
+              value-format="yyyy"
+              size="small"
+              @change="fetchData1"/>
+          </el-col>
+          <el-col :span="5">
+            <el-date-picker
+              v-model="month"
+              type="month"
+              placeholder="请选择统计年月"
+              value-format="yyyy-MM"
+              size="small"
+              @change="fetchData1"/>
+          </el-col>
+          <el-col :span="5">
+            <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>
+          </el-col>
+        </el-row>
+        <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>
+  </div>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/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>
+  .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
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..89f2815
--- /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/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..a7caa86
--- /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/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..266ee8d
--- /dev/null
+++ b/src/views/toilet/listToilet.vue
@@ -0,0 +1,249 @@
+<template>
+  <div class="app-container">
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-form-item prop="keywords">
+          <el-input v-model.trim="listQuery.keywords" placeholder="公厕编号/名称" clearable/>
+        </el-form-item>
+        <el-form-item prop="owner">
+          <el-input v-model.trim="listQuery.owner" placeholder="建设单位" clearable/>
+        </el-form-item>
+        <el-form-item prop="position">
+          <el-input v-model.trim="listQuery.position" placeholder="位置" clearable/>
+        </el-form-item>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>
+        <!--</el-row>-->
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+        </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">
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="210" align="center">
+          <template slot-scope="scope">
+            <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
+            <el-button type="warning" size="mini" @click="edit(scope.row)">编辑</el-button>
+            <el-button type="danger" size="mini" @click="del(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>
+    <edit-toilet v-show="editShow" ref="edittoilet" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import { getToiletList, delToilet } from '@/api/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 // 是否显示编辑框
+    }
+  },
+  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..0e5d085
--- /dev/null
+++ b/src/views/toilet/listWork.vue
@@ -0,0 +1,205 @@
+<template>
+  <app-container>
+    <search-area :need-clear="false" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.tolietKeywords" placeholder="公厕编号/名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="作业人" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.jobContent" placeholder="作业内容" clearable/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </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/NomalTable'
+  import AppContainer from '@/components/layout/AppContainer'
+  import SearchArea from '@/components/SearchArea/SearchArea'
+  import SearchItem from '@/components/SearchArea/SearchItem'
+  import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/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/api/login.js b/src/api/login.js
index 19187ca..ab56344 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,10 +15,11 @@
   })
 }
 // 获取用户权限（菜单、按钮）
-export function getMenus() {
+export function getMenus(params) {
   return request({
     url: '/user/permission',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 // 登出
diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js
index b8f29db..b25efe9 100644
--- a/src/api/system/statistics.js
+++ b/src/api/system/statistics.js
@@ -4,10 +4,18 @@
 import request from '@/utils/request'
 // import qs from 'qs'
 
-// 年养护次数统计
-export function countByYear(params) {
+//
+export function countByToilet(params) {
   return request({
-    url: 'maintain/maintainCount',
+    url: '/sanitation/toiletStatistic/jobStaticByToilet',
+    method: 'get',
+    params
+  })
+}
+
+export function countByDay(params) {
+  return request({
+    url: '/sanitation/toiletStatistic/jobStaticByDate',
     method: 'get',
     params
   })
diff --git a/src/api/system/toilet.js b/src/api/system/toilet.js
new file mode 100644
index 0000000..8f38b8f
--- /dev/null
+++ b/src/api/system/toilet.js
@@ -0,0 +1,91 @@
+/**
+ * 公厕管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+export function getToiletList(params) {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get',
+    params
+  })
+}
+
+export function getDetail(id) {
+  return request({
+    url: '/sanitation/toiletClean/detail',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+
+// 公厕查询
+export function getToiletAll() {
+  return request({
+    url: '/sanitation/toilet/listPage',
+    method: 'get'
+  })
+}
+
+// 添加公厕
+export function addToilet(params) {
+  return request({
+    url: '/sanitation/toilet/add',
+    method: 'post',
+    params
+  })
+}
+// 修改公厕机构
+export function updateToilet(params) {
+  return request({
+    url: '/sanitation/toilet/update',
+    method: 'post',
+    params
+  })
+}
+// 删除公厕机构
+export function delToilet(ids) {
+  return request({
+    url: '/sanitation/toilet/delete',
+    method: 'post',
+    params: {
+      ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导出
+export function exportRecords(params) {
+  return request({
+    url: 'device/batchExport',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 公厕保洁记录查询
+export function getToiletJobRecords(params) {
+  return request({
+    url: '/sanitation/toilet/jobRecord',
+    method: 'get',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportToiletJobRecords(params, config) {
+  return request({
+    url: '/sanitation/toilet/exportJobRecord',
+    method: 'get',
+    timeout: 120000,
+    params,
+    ...config,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/assets/global_images/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/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/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/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/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 84bdb9f..8d8912e 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -1,6 +1,14 @@
 <template>
   <el-header class="app-header">
     <h3>{{ title }}</h3>
+    <!--子系统选项-->
+    <el-dropdown v-if="showChangeSys" class="systemSelect" size="medium" @command="handleCommand">
+      <span class="el-dropdown-link">{{ currentSystem.name }}<i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item v-for="system in systems" :command="system" :key="system.id">{{ system.name }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
     <el-dropdown class="dropdown-container" trigger="click">
       <div class="dropdown-wrapper">
         <span style="line-height:50px;">欢迎您，{{ name }}</span>
@@ -33,6 +41,7 @@
   data() {
     return {
       title: this.baseConfig.title, // 标题
+      showChangeSys: !this.baseConfig.singleSys, // 是否显示切换系统菜单
       name: this.$store.getters.name, // 用户姓名
       showSetPwd: false // 是否显示修改密码按钮
     }
@@ -40,9 +49,16 @@
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'currentSystem',
+      'systems'
     ])
   },
+  created() {
+    if (!this.baseConfig.singleSys) {
+      this.getSystems()
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
@@ -55,6 +71,38 @@
     resetPwd() {
       this.showSetPwd = true
       this.$refs.retPwd.initDialog(true)
+    },
+    backToIndex() {
+      const url = this.baseConfig.mainPage
+      window.location.href = url
+    },
+    // 切换子系统
+    handleCommand(command) {
+      console.log('切换子系统:' + command.name)
+      const params1 = `?token=${this.$store.getters.token}`
+      const params = `?sys=${command.name}&url=${command.url}&code=${command.code}&token=${this.$store.getters.token}`
+      // 判断系统是不是http的，如果是则打开新窗口
+      if (command.url.indexOf('http') > -1) {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = command.url + params1
+        } else {
+          window.open(command.url + params1, '_blank')
+        }
+      } else {
+      // 取token
+        if (this.baseConfig.sameWindow) {
+          window.location.href = this.baseConfig.mainPage + command.url + params
+        } else {
+          window.open(this.baseConfig.mainPage + command.url + params, '_blank')
+        }
+      }
+    },
+    // 获取子系统
+    getSystems() {
+      this.$store.dispatch('GetSystems').then(() => {
+        console.log('获取子系统列表成功-appHeader')
+      })
     }
   }
 }
@@ -89,4 +137,15 @@
       }
     }
   }
+  .systemSelect{
+    height: 56px;
+    display: inline-block;
+    float: left;
+    z-index:500;
+    position: fixed;
+    margin-left:60px;
+    top:5px;
+    color:#fff;
+    line-height: 56px;
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1091fc0..5839f2d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -13,7 +13,7 @@
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="(!tag.meta.affix)&&(visitedViews.length!=1)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
diff --git a/src/permission.js b/src/permission.js
index 5965c45..dc6b2f8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,20 +26,12 @@
           // 设置当前子系统为基础资源子系统
           const currentSys = {
             code: 'baseResourse',
-            id: '1189107859077373285',
-            ismenu: '0',
-            levels: 1,
-            name: '基础资源子系统',
-            num: 0,
-            parentId: '0',
-            resourceType: '02',
-            url: '/baseResourse'
+            name: '基础资源子系统'
           }
           // 将当前系统信息保存在localStorage中
           store.commit('SET_SYSTEM', currentSys)
           // 远程访问获取权限列表（菜单&按钮）
           store.dispatch('GetMenus', currentSys).then(() => {
-            store.commit('SET_CHANGEFLAG', '0')
             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           })
diff --git a/src/router/index.js b/src/router/index.js
index 48cffff..74a71b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,10 @@
 
 /* Layout */
 import Layout from '@/layout/Layout'
-import { overviewRouters } from './modules/overview'
-import { orderRouters } from './modules/order'
-import { bridgeRouters } from './modules/bridge'
+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'
 
@@ -48,21 +48,7 @@
   // 404错误页面
   { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
   // 401 错误页面
-  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true },
-  // 主页
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'dashboard',
-    name: 'Dashboard',
-    // hidden: true,
-    children: [{
-      path: 'dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-    }]
-  }
+  { path: '/401', component: () => import('@/views/errorPage/401'), hidden: true }
 ]
 // 实例化vue的时候直挂载constantRouter
 export default new Router({
@@ -74,11 +60,10 @@
 // 异步挂载路由
 // 动态需要根据权限加载的路由表
 export const asyncRouterMap = [
-  ...overviewRouters,
-  ...orderRouters,
-  ...bridgeRouters,
+  ...toiletRouters,
+  ...workRouters,
   ...statisticsRouters,
-  ...exampleRouters,
+  ...ruleRouters,
   ...systemRouters,
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/router/modules/bridge.js b/src/router/modules/bridge.js
deleted file mode 100644
index 05a4748..0000000
--- a/src/router/modules/bridge.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const bridgeRouters = [
-  {
-    path: 'bridge',
-    component: Layout,
-    redirect: '/yongSheng',
-    name: 'Bridge',
-    meta: {
-      title: '桥梁管理',
-      icon: 'icon-config', // 图标
-      permission: ['/bridgeManage']// 权限名称
-    },
-    children: [
-      {
-        path: '/yongSheng',
-        name: 'YongSheng',
-        component: () => import('@/views/bridge/yongSheng'),
-        meta: { title: '永胜桥', icon: 'function', permission: ['/yongSheng'] }
-      },
-      {
-        path: '/huangZhou',
-        name: 'HuangZhou',
-        component: () => import('@/views/bridge/huangZhou'),
-        meta: { title: '黄洲桥', icon: 'function', permission: ['/huangZhou'] }
-      },
-      {
-        path: '/guangMing',
-        name: 'GuangMing',
-        component: () => import('@/views/bridge/guangMing'),
-        meta: { title: '光明桥', icon: 'function', permission: ['/guangMing'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/example.js b/src/router/modules/example.js
index 9076d50..b5d57bf 100644
--- a/src/router/modules/example.js
+++ b/src/router/modules/example.js
@@ -1,21 +1,36 @@
 /* Layout */
 import Layout from '@/layout/Layout'
-export const exampleRouters = [{
-  path: 'example',
-  component: Layout,
-  redirect: '/exampleTable',
-  name: 'Example',
-  alwaysShow: true,
-  meta: {
-    title: '示例',
-    icon: 'icon-config' // 图标
+export const exampleRouters = [
+  // 主页
+  {
+    path: '/',
+    component: Layout,
+    redirect: 'dashboard',
+    name: 'Dashboard',
+    // hidden: true,
+    children: [{
+      path: 'dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index'),
+      meta: { title: '首页', icon: 'dashboard', noCache: true }
+    }]
   },
-  children: [
-    {
-      path: '/exampleTable',
-      name: 'ExampleTable',
-      component: () => import('@/views/example/tableExample'),
-      meta: { title: '表格示例', icon: '' }
-    }
-  ]
-}]
+  {
+    path: 'example',
+    component: Layout,
+    redirect: '/exampleTable',
+    name: 'Example',
+    alwaysShow: true,
+    meta: {
+      title: '示例',
+      icon: 'icon-config' // 图标
+    },
+    children: [
+      {
+        path: '/exampleTable',
+        name: 'ExampleTable',
+        component: () => import('@/views/example/tableExample'),
+        meta: { title: '表格示例', icon: '' }
+      }
+    ]
+  }]
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
deleted file mode 100644
index fdb43c5..0000000
--- a/src/router/modules/order.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const orderRouters = [
-  {
-    path: 'order',
-    component: Layout,
-    redirect: '/rule',
-    name: 'Order',
-    meta: {
-      title: '工单管理',
-      icon: 'icon-config', // 图标
-      permission: ['/order']// 权限名称
-    },
-    children: [
-      {
-        path: '/order',
-        name: 'Order',
-        component: () => import('@/views/order/listMaintainRecords'),
-        meta: { title: '养护记录', icon: 'dashboard', permission: ['/order'] }
-      }
-    ]
-  }]
diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js
deleted file mode 100644
index 5879990..0000000
--- a/src/router/modules/overview.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Layout */
-import Layout from '@/layout/Layout'
-
-export const overviewRouters = [
-  {
-    path: 'overviewBridge',
-    component: Layout,
-    redirect: '/overviewBridge',
-    name: 'OverviewBridge',
-    meta: {
-      title: '运行总览',
-      icon: 'icon-overview', // 图标
-      permission: ['/overviewBridge']// 权限名称
-    },
-    children: [
-      {
-        path: '/overviewBridge',
-        name: 'OverviewBridge',
-        component: () => import('@/views/overview/overview.vue'),
-        meta: { title: '运行总览', icon: 'function', permission: ['/overviewBridge'] }
-      }
-    ]
-  }
-]
diff --git a/src/router/modules/toilet.js b/src/router/modules/toilet.js
new file mode 100644
index 0000000..18b0fbb
--- /dev/null
+++ b/src/router/modules/toilet.js
@@ -0,0 +1,30 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listToilet'),
+        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..9d5dda9
--- /dev/null
+++ b/src/router/modules/work.js
@@ -0,0 +1,24 @@
+/* Layout */
+import Layout from '../../views/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/toilet/listWork'),
+        meta: { title: '作业管理', icon: 'function', permission: ['/toiletWork'] }
+      }
+    ]
+  }
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 80b80fb..1e26c7a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -6,16 +6,19 @@
   kaptcha: state => state.app.kaptcha, // 验证码
   publicKey: state => state.app.publicKey, // 公钥
   sid: state => state.app.sid, // 用户标识
+  currentSystem: state => state.app.currentSystem, // 当前子系统
   token: state => state.user.token, // token
   id: state => state.user.id, // id
   account: state => state.user.account, // 账户
   name: state => state.user.name, // 姓名
+  avatar: state => state.user.avatar, // 头像
   roleList: state => state.user.roleList, // 角色列表
   roleNames: state => state.user.roleNames, // 角色名称列表
   roleTips: state => state.user.roleTips, // 角色名称列表
   deptId: state => state.user.deptId, // 权属单位
   deptName: state => state.user.deptName, // 权属单位名称
   menus: state => state.permission.menus, // 菜单
+  systems: state => state.permission.systems, // 子系统
   permission_routers: state => state.permission.routers, // 用户有权限的路由
   addRouters: state => state.permission.addRouters, // 添加的路由
   btns: state => state.permission.btns, // 用户所有的按钮权限
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index f65d58f..b2c0092 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import { getConfig } from '@/api/login'
 import { getPublicKey, setPublicKey } from '../../utils/auth'
-
+import { getCurrentSys, setCurrentSys } from '@/utils/auth'
 const state = {
   sidebar: {
     opened: !+Cookies.get('sidebarStatus'),
@@ -10,6 +10,7 @@
   device: 'desktop',
   kaptcha: '', // 验证码
   publicKey: getPublicKey(), // 公钥
+  currentSystem: getCurrentSys(), // 当前子系统
   sid: '' // sid
 }
 const mutations = {
@@ -35,6 +36,10 @@
     state.publicKey = config.publicKey
     state.sid = config.sid
     setPublicKey(config.publicKey)
+  },
+  SET_SYSTEM: (state, system) => {
+    state.currentSystem = system
+    setCurrentSys(system)
   }
 }
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1dde5c8..a0cb8cf 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,18 +44,18 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    // if (hasPermission(menus, tmp)) { // 如果有权限,添加该路由，old
-    //   if (tmp.children) {
-    //     tmp.children = filterAsyncRouter(tmp.children, menus)
-    //   }
-    //   res.push(tmp)
-    // }
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
+        if (tmp.path && tmp.children.length > 0) {
+          console.log(tmp.path + '->' + tmp.children[0].path)
+          tmp.redirect = tmp.children[0].path
+        } else {
+          tmp.redirect = '/dashboard'
+        }
       }
       res.push(tmp)
     } else {
@@ -71,6 +71,7 @@
   state: {
     routers: constantRouterMap,
     addRouters: [],
+    systems: [], // 子系统
     menus: [], // 菜单
     btns: [] // 按钮
   },
@@ -79,6 +80,9 @@
       state.addRouters = routers
       state.routers = constantRouterMap.concat(routers)
     },
+    SET_SYSTEMS: (state, systems) => {
+      state.systems = Array.from(systems)
+    },
     SET_MENUS: (state, menus) => {
       state.menus = Array.from(menus)
     },
@@ -87,6 +91,34 @@
     }
   },
   actions: {
+    // 获取用户子系统权限
+    GetSystems({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          resourceType: '02' // 02 是子系统
+        }
+        debugger
+        // 获取权限内所有的子系统
+        getMenus(params).then(response => { // 处理返回值
+          const data = response.data
+          const systems = [] // 子系统
+          if (data.menus && data.menus.length > 0) {
+            commit('SET_SYSTEMS', data.menus)
+            for (const menu of data.menus) { // 遍历子系统资源，放入systems
+              const menu_tmp = {}
+              menu_tmp.id = menu.id
+              menu_tmp.url = menu.url
+              menu_tmp.icon = menu.icon
+              menu_tmp.name = menu.name
+              systems.push(menu_tmp)
+            }
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 获取用户权限
     GetMenus({ commit, state }) {
       console.log('in store.permission.js:GetMenus:')
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index b7e3be9..b6fe85d 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -20,19 +20,23 @@
   },
 
   DEL_VISITED_VIEW: (state, view) => {
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
-        state.visitedViews.splice(i, 1)
-        break
+    if (!(state.visitedViews.length === 1 && state.visitedViews[0] === view)) {
+      for (const [i, v] of state.visitedViews.entries()) {
+        if (v.path === view.path) {
+          state.visitedViews.splice(i, 1)
+          break
+        }
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    for (const i of state.cachedViews) {
-      if (i === view.name) {
-        const index = state.cachedViews.indexOf(i)
-        state.cachedViews.splice(index, 1)
-        break
+    if (!state.cachedViews.length === 1 && state.cachedViews[0] === view) {
+      for (const i of state.cachedViews) {
+        if (i === view.name) {
+          const index = state.cachedViews.indexOf(i)
+          state.cachedViews.splice(index, 1)
+          break
+        }
       }
     }
   },
@@ -54,11 +58,13 @@
 
   DEL_ALL_VISITED_VIEWS: state => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
     state.visitedViews = affixTags
   },
   DEL_ALL_CACHED_VIEWS: state => {
-    state.cachedViews = []
+    // state.cachedViews = []
+    // const affixTags = state.visitedViews.filter((tag, index) => tag.meta.affix || index === 0)
+    // state.cachedViews = affixTags
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 213f5e6..4d49da3 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,6 +2,7 @@
 
 const TokenKey = 'token'
 const PublicKey = 'public_key'
+const CurrentSystem = 'current_system'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -26,4 +27,21 @@
 export function removePublicKey() {
   return window.localStorage.removeItem(PublicKey)
 }
+export function getCurrentSys() {
+  let currentSystem = window.localStorage.getItem(CurrentSystem)
+  if (typeof (currentSystem) === 'undefined') {
+    return undefined
+  } else {
+    currentSystem = JSON.parse(currentSystem)
+    return currentSystem
+  }
+}
+export function setCurrentSys(currentSystem) {
+  console.log('in auth setCurrentSys')
+  const currentSys = JSON.stringify(currentSystem)
+  return window.localStorage.setItem(CurrentSystem, currentSys)
+}
 
+export function removeCurrentSys() {
+  return window.localStorage.removeItem(CurrentSystem)
+}
diff --git a/src/views/alarmManage/components/alarmDetail.vue b/src/views/alarmManage/components/alarmDetail.vue
deleted file mode 100644
index 9cf6ae3..0000000
--- a/src/views/alarmManage/components/alarmDetail.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" title="报警详情" append-to-body>
-    <el-form ref="dataForm" :model="alarmForm" size="small" label-well-code="right" label-width="110px">
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备名称" prop="deviceName">
-            <el-input v-model.trim="alarmForm.deviceName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警时间" prop="alarmTime">
-            <el-input v-model.trim="alarmForm.alarmTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警类型" prop="alarmTypeName">
-            <el-input v-model.trim="alarmForm.alarmTypeName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="报警数值" prop="alarmValue">
-            <el-input v-model.trim="alarmForm.alarmValue" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="报警状态" prop="alarmStatusName">
-            <el-input v-model.trim="alarmForm.alarmStatusName" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="消警时间" prop="cancelTime">
-            <el-input v-model.trim="alarmForm.cancelTime" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="设备位置" prop="address">
-            <el-input v-model.trim="alarmForm.address" disabled type="text" placeholder=""/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <!--<div v-show="isEditMode" slot="footer" class="dialog-footer">-->
-    <!--<el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>-->
-    <!--<el-button @click="cancel">取消</el-button>-->
-    <!--</div>-->
-  </el-dialog>
-</template>
-
-<script>
-import { getDetail } from '@/api/system/alarm'
-export default {
-  name: 'AlarmDetail',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      alarmForm: {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      } // 表单
-    }
-  },
-  created() {
-    // this.fetchLampboxList() // 获取灯箱列表
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, row = null) {
-      this.dialogFormVisible = dialogFormVisible
-      this.resetForm()
-      getDetail(row.id).then(response => {
-        if (response.code === 200) {
-          var row = response.data
-          this.alarmForm = {
-            id: row.id,
-            deviceName: row.deviceName,
-            alarmTime: row.alarmTime,
-            alarmTypeName: row.alarmTypeName,
-            alarmValue: row.alarmValue,
-            alarmStatusName: row.alarmStatusName,
-            cancelTime: row.cancelTime,
-            address: row.address
-          }
-        }
-      }).catch(() => {
-        // this.$message.error('')
-      })
-    },
-    // 清除数据
-    resetForm() {
-      this.alarmForm = {
-        id: '', // id
-        deviceName: '',
-        alarmTime: '',
-        alarmTypeName: '',
-        alarmValue: '',
-        alarmStatusName: '',
-        cancelTime: '',
-        address: ''
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .dialog-footer {
-    margin-top: -20px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/bridge/components/detail.vue b/src/views/bridge/components/detail.vue
deleted file mode 100644
index 96cf9f8..0000000
--- a/src/views/bridge/components/detail.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<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" id="map" style="height: 480px; width: 800px; margin-left: 130px" 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/system/bridge'
-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{
-      background-color: #fffffb !important;
-      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;
-          }
-        }
-      }
-    }
-  }
-  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/bridge/components/editBridge.vue b/src/views/bridge/components/editBridge.vue
deleted file mode 100644
index 6182fee..0000000
--- a/src/views/bridge/components/editBridge.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogFormVisible" title="编辑" append-to-body @close="cancel">
-    <div class="info-block">
-      <div class="block-body">
-        <div class="body-right">
-          <el-row>
-            <el-col :span="24">
-              <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="8">
-              <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 }}</span>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="item-div">
-                <span class="item-title">通车时间：</span>
-                <span class="item-value-middle">{{ bridgeForm.openTime }}</span>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col>
-              <div class="item-div">
-                <span class="item-title">桥梁照片：</span>
-                <span v-show="bridgeForm.photo===''" class="item-value-middle">无</span>
-                <el-image
-                  v-show="bridgeForm.photo!==''"
-                  :src="bridgeForm.photo!==''?bridgeForm.photo:null"
-                  fit="cover"
-                  style="width: 130px; height: 175px"/></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-show="showMap" class="overview-map-container">
-                  <div id="map"/>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <div class="item-div">
-                <span class="item-title" style="display: inline-block; float: left">桥梁简介：</span>
-                <el-input v-model="bridgeForm.description" :rows="3" :maxlength="100" type="textarea" style="display: inline-block; float: left" show-word-limit/>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-        <!--<div class="clearfloat"/>-->
-      </div>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { getDetail } from '@/api/system/bridge'
-import * as L from 'leaflet'
-
-export default {
-  name: 'EditBridge',
-  data() {
-    return {
-      dialogFormVisible: false,
-      showMap: false,
-      map: null,
-      icon: 'static/images/well/0100.png',
-      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: {
-    initDialog: function(dialogFormVisible, bridgeId = '') {
-      this.dialogFormVisible = dialogFormVisible
-      getDetail(bridgeId).then(response => {
-        this.bridgeForm = response.data
-      })
-    },
-    checkMap() {
-      this.showMap = true
-      const map = L.map('map', {
-        minZoom: 3,
-        maxZoom: 14,
-        center: [39.550339, 116.114129],
-        zoom: 12,
-        zoomControl: false,
-        attributionControl: false,
-        crs: L.CRS.EPSG3857
-      })
-      this.map = map // data上需要挂载
-      window.map = map
-      L.tileLayer(
-        // 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}'
-        'http://t1.tianditu.com/vec_c/wmts?layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
-      ).addTo(map)
-      L.marker([39.550339, 116.114129], {
-        // icon: greenIcon,
-        title: '桥梁信息'
-      }).addTo(map)
-    },
-    cancel() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $left-width: 160px;
-  .info-block{
-    margin-left: 40px;
-    padding-bottom: 20px;
-    /*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% - 80px );
-        /*float: left;*/
-        .item-div{
-          line-height: 40px;
-          font-size:14px;
-          .item-title{
-            text-align: right;
-            width:120px;
-            color: #909090;
-            font-weight: bold;
-            float:left;
-          }
-          .item-value-middle{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 280px !important;
-            /*float:left;*/
-          }
-          .item-value-long{
-            margin-left: 10px;
-            color: #a5a5a5;
-            width: 790px !important;
-            /*float:left;*/
-          }
-        }
-      }
-    }
-    .person-photo{
-      width: 106px;
-      height: 150px;
-      padding: 1px;
-      border: 1px solid #92dfff;
-    }
-
-  }
-</style>
diff --git a/src/views/bridge/guangMing.vue b/src/views/bridge/guangMing.vue
deleted file mode 100644
index 2a50ac4..0000000
--- a/src/views/bridge/guangMing.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('3')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/huangzhou.vue b/src/views/bridge/huangzhou.vue
deleted file mode 100644
index 311b07b..0000000
--- a/src/views/bridge/huangzhou.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <div>
-      <detail ref="detail" @watchChild="fetchData"/>
-    </div>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('2')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
diff --git a/src/views/bridge/yongSheng.vue b/src/views/bridge/yongSheng.vue
deleted file mode 100644
index b986dbb..0000000
--- a/src/views/bridge/yongSheng.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="container-bridge">
-    <el-button type="primary" style="float:right; margin-right: 260px; margin-top: 10px" icon="el-icon-edit" @click="edit">编辑</el-button>
-    <detail ref="detail" @watchChild="fetchData"/>
-    <edit-bridge v-show="editShow" ref="editbridge" @watchChild="fetchData"/>
-  </div>
-</template>
-<script>
-import detail from '@/views/bridge/components/detail'
-import editBridge from '@/views/bridge/components/editBridge'
-export default {
-  name: 'YongSheng',
-  components: { detail, editBridge },
-  data() {
-    return {
-      editShow: false
-    }
-  },
-  mounted() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.$refs.detail.fetchData('1')
-    },
-    edit() {
-      this.$refs.detail.showUploadBut()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .container-bridge{
-    background-color: #fffffb !important;
-    width: 100%;
-    height: 100%;
-    min-height: calc(100vh - 158px);
-    overflow: auto;
-    margin-bottom: 120px;
-    padding-bottom: 20px;
-    margin-top: 0;
-  }
-</style>
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..a0decda
--- /dev/null
+++ b/src/views/mapViews/mapView.vue
@@ -0,0 +1,74 @@
+<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 { 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: 'http://t1.tianditu.com/vec_w/wmts?layer=vec&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447',
+      mapurl: this.baseConfig.mapUrl,
+      // mapurl: 'http://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      // labelurl: 'http://t1.tianditu.com/cva_w/wmts?layer=cva&style=default&tilematrixset=w&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=adbdd8e08c292f6cb4e3f0289f7d0447'
+      labelurl: this.baseConfig.labelUrl
+    }
+  },
+  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/overview/lampTabPane.vue b/src/views/overview/lampTabPane.vue
deleted file mode 100644
index a29618c..0000000
--- a/src/views/overview/lampTabPane.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="tab-block">
-    <el-radio-group v-model="type" @change="changeType">
-      <el-radio :label="'lamp'">按路灯</el-radio>
-      <el-radio :label="'lampbox'">按灯箱</el-radio>
-      <el-radio :label="'circuit'">按回路</el-radio>
-    </el-radio-group>
-    <!-- 按路灯搜索 -->
-    <div class="search-row">
-      <el-row v-if="type === 'lamp'" :gutter="10">
-        <el-col :span="6">
-          <el-input v-model.trim="lampQuery.lampCode" size="small" placeholder="路灯编号" clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.status" size="small" placeholder="路灯状态" clearable>
-            <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select v-model="lampQuery.lampArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按灯箱搜索 -->
-      <el-row v-if="type === 'lampbox'" :gutter="10">
-        <el-col :span="8">
-          <el-input v-model.trim="lampQuery.lampboxCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxStreet" size="small" placeholder="道路" filterable clearable>
-            <el-option v-for="item in streetList" :key="item.id" :label="item.streetName" :value="item.id"/>
-          </el-select>
-        </el-col>
-        <el-col :span="8">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 按回路搜索 -->
-      <el-row v-if="type === 'circuit'" :gutter="10">
-        <el-col :span="10" :offset="2">
-          <el-input v-model.trim="lampQuery.circuitCode" size="small" placeholder="灯箱编号" clearable />
-        </el-col>
-        <el-col :span="10">
-          <el-select v-model="lampQuery.lampboxArea" size="small" placeholder="责任网格" filterable clearable>
-            <el-option v-for="item in areaList" :key="item.id" :label="item.areaName" :value="item.id"/>
-          </el-select>
-        </el-col>
-      </el-row>
-      <!-- 搜索 & 开关灯 -->
-      <el-row class="button-row">
-        <el-button class="search-button" size="small" type="primary" @click="searchLamp">搜索</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','1')">开灯</el-button>
-        <el-button class="search-button" size="small" type="primary" @click="controlLamp('','0')">关灯</el-button>
-      </el-row>
-    </div>
-    <!-- 搜索结果列表 -->
-    <el-table
-      v-loading="listLoading"
-      v-show="showList"
-      :row-style="{height: '33px'}"
-      :cell-style="{padding: '0px'}"
-      :data="lampList"
-      class="infinite-list"
-      border
-      infinite-scroll-disabled="disabled"
-      max-height="300px"
-      style="margin-top: 20px;"
-      @row-click="rowClick"
-      @selection-change="handleSelectionChange">
-      <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
-      <el-table-column align="center" type="index" label="序号" width="50"/>
-      <el-table-column align="center" prop="lampCode" label="路灯编号"/>
-      <el-table-column align="center" prop="lampName" label="路灯名称"/>
-      <el-table-column align="center" prop="statusName" label="路灯状态" width="80"/>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getAllStreet } from '@/api/street'
-
-export default {
-  name: 'LampTabPane',
-  props: {
-    lampQuery: {
-      type: Object,
-      default: function() {
-        return {
-          lampCode: '',
-          status: '',
-          lampStreet: '',
-          lampArea: '',
-          lampboxCode: '',
-          lampboxStreet: '',
-          lampboxArea: '',
-          circuitCode: ''
-        }
-      }
-    }, // 查询条件
-    lampList: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }, // 路灯列表
-    listLoading: {
-      type: Boolean,
-      default: false
-    }, // 列表加载
-    showList: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      type: 'lamp',
-      statusList: [
-        { value: '1', name: '开灯' },
-        { value: '2', name: '灭灯' },
-        { value: '3', name: '报警' },
-        { value: '4', name: '离线' }
-      ],
-      streetList: [],
-      areaList: []
-    }
-  },
-  created() {
-    this.initStreetList()
-    this.initAreaList()
-  },
-  methods: {
-    searchLamp() {
-      console.log('inQuery', this.lampQuery)
-      this.$emit('searchLamp')
-      // this.showList = true
-    },
-    controlLamp(lampIds, controlType) {
-      this.$emit('controlLamp', { lampIds: lampIds, controlType: controlType })
-    },
-    initStreetList() {
-      getAllStreet().then(res => {
-        this.streetList = res.data
-      })
-    },
-    initAreaList() {
-      // todo
-      getAllStreet().then(res => {
-        this.areaList = res.data
-      })
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 状态为"离线"，不能勾选
-    selectable(row, index) {
-      return row.status !== '4'
-    },
-    rowClick(row) {
-      this.$emit('rowClick', row)
-    },
-    changeType() {
-      this.$emit('changeType')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-radio-group{
-  margin: 10px;
-  margin-bottom: 0px;
-}
-.search-row{
-  margin: 10px;
-}
-.button-row{
-  /*margin: 10px;*/
-  margin-top: 10px;
-  margin-bottom: -15px;
-}
-.search-button{
-  margin: 10px;
-}
-  .infinite-list{
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index ff9f9a1..641e1bf 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -31,7 +31,7 @@
 <script>
 import L from 'leaflet'
 import 'leaflet/dist/leaflet.css'
-import { getDetail } from '@/api/system/bridge'
+import { getDetail } from '@/api/bridge'
 // import icon from '/static/images/well/0100.png'
 // import { getAllMarker } from '@/api/overview'
 // import { getMarkerInfo } from '@/api/marker'
diff --git a/src/views/rule/components/setThresh.vue b/src/views/rule/components/setThresh.vue
deleted file mode 100644
index a0ee404..0000000
--- a/src/views/rule/components/setThresh.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body @close="cancel">
-      <el-form ref="dataForm" :rules="rules" :model="monitorForm" label-well-code="right" label-width="140px">
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="监控点名称" prop="monitorName">
-              <el-input v-model.trim="monitorForm.monitorName" disabled type="text" placeholder="必填"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="所属场站" prop="stationName">
-              <el-input v-model="monitorForm.stationName" disabled placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="燃气浓度报警阈值" prop="high">
-              <el-input v-model.trim="monitorForm.high" type="number" :min="0" placeholder="燃气浓度报警阈值"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveData">保存</el-button>
-        <el-button @click="cancel">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { setThresh } from '@/api/system/alarm'
-
-export default {
-  name: 'SetThresh',
-  data() {
-    const validateHigh = (rule, value, callback) => {
-      if (value !== '') {
-        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
-          callback(new Error('请填写大于0的数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback(new Error('消警持续时间不能为空'))
-      }
-    }
-    return {
-      listLoading: true,
-      dialogFormVisible: false, // 对话框是否显示
-      monitorForm: {
-        stationName: '',
-        monitorId: '',
-        monitorName: '',
-        high: '' // 报警阈值
-      },
-      title: '', // 表头显示标题
-      rules: {
-        high: [{ required: true, validator: validateHigh, trigger: ['change', 'blur'] }]
-      } // 前端校验规则
-    }
-  },
-  watch: { },
-  mounted() { },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogFormVisible, monitorInfo) {
-      debugger
-      this.dialogFormVisible = dialogFormVisible
-      this.title = '设置监控点报警阈值'
-      this.monitorForm.stationName = monitorInfo.stationName
-      this.monitorForm.monitorName = monitorInfo.monitorPointName
-      this.monitorForm.monitorId = monitorInfo.monitorPointId
-      this.monitorForm.high = monitorInfo.high
-    },
-    // 重置表单
-    resetForm() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    // 保存数据
-    saveData: function() {
-      // 表单校验
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          setThresh(this.monitorForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('设置成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .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
-    }
-  }
-  .dialog-footer{
-    text-align: right;
-    margin-top: 10px;
-  }
-</style>
diff --git a/src/views/rule/listRule.vue b/src/views/rule/listRule.vue
index a19b9e4..b693382 100644
--- a/src/views/rule/listRule.vue
+++ b/src/views/rule/listRule.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getRuleList } from '@/api/system/rule'
+import { getRuleList } from '@/api/rule'
 // import DownloadTemplate from '@/components/DownloadTemplate'
 
 export default {
diff --git a/src/views/statistics/barChart.vue b/src/views/statistics/barChart.vue
index 34910e2..b23f51d 100644
--- a/src/views/statistics/barChart.vue
+++ b/src/views/statistics/barChart.vue
@@ -1,51 +1,54 @@
 <template>
   <ve-histogram
     :data="data"
-    :settings="chartSettings"
-    :extend="extend"/>
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'BarChart',
-  props: {
-    data: {
-      type: Object,
-      default() {
-        return {
-          columns: ['typeName', 'count'],
+import { countByToilet, countByDay } from '@/api/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: []
         }
       }
-    }
-  },
-  data() {
-    return {
-      extend: {
-        series: {
-          label: { show: true, position: 'top' },
-          itemStyle: {
-            normal: {
-              barBorderRadius: [3, 3, 0, 0]
-            }
-          },
-          barMaxWidth: 35
+    },
+    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)
+          })
         }
       },
-      chartSettings: {
-        labelMap: {
-          'inoutType': '进出类型',
-          'num': '进出数量'
-        },
-        itemStyle: {
-          'barCategoryGap': 5
-        },
-        demension: 'inoutType',
-        barWidth: 15
-      }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/maintainStatistics.vue b/src/views/statistics/maintainStatistics.vue
deleted file mode 100644
index a86e235..0000000
--- a/src/views/statistics/maintainStatistics.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="statistic-container">
-      <el-row class="chart-tools">
-        <el-col :span="5" >
-          <el-date-picker
-            v-model="listQuery.year"
-            type="year"
-            placeholder="请选择统计年份"
-            value-format="yyyy"
-            size="small"
-            @change="fetchData"/>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24" class="chart-body" >
-          <div class="chart-body-title">各类型养护数量统计及占比</div>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12" class="chart-body" >
-          <pie-chart :list="chartList"/>
-        </el-col>
-        <el-col :span="12" class="chart-body">
-          <el-table :data="list" class="table" border style="margin-top: 50px">
-            <el-table-column 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">
-              <template slot-scope="scope">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-      </el-row>
-    </div>
-  </div>
-</template>
-
-<script>
-import { countByYear } 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: 'MaintainStatistics',
-  components: { BarChart, PieChart, DeptSelect },
-  data() {
-    return {
-      listQuery: {
-        year: '',
-        offset: 1,
-        limit: 20,
-        sort: 'count',
-        order: 'desc'
-      },
-      columns: [
-        {
-          text: '养护类型',
-          value: 'typeName',
-          align: 'center'
-        },
-        {
-          text: '养护数量',
-          value: 'count',
-          align: 'center'
-        },
-        {
-          text: '占比',
-          value: 'percent',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      chartList: [],
-      chartshow: false
-    }
-  },
-  watch: {},
-  mounted() {
-    this.fetchData()
-  },
-  activated() {
-    this.fetchData()
-  },
-  methods: {
-    // 获取统计数据
-    fetchData() {
-      console.log('this.fetchData')
-      countByYear(this.listQuery).then(response => {
-        // var data = response.data
-        // for (var i = 0; i < data.length; i++) {
-        //   data[i].num = parseInt(data[i].num)
-        // }
-        this.chartList = response.data.rows
-        this.list = response.data.rows
-      })
-    },
-    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>
-  .app-container{
-    .statistic-container{
-      background-color: #fffffb !important;
-      height: auto;
-      min-height: calc(100vh - 158px);
-      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
-        }
-      }
-    }
-  }
-</style>
diff --git a/src/views/statistics/pieChart.vue b/src/views/statistics/pieChart.vue
index d69f41a..1012152 100644
--- a/src/views/statistics/pieChart.vue
+++ b/src/views/statistics/pieChart.vue
@@ -1,61 +1,47 @@
 <template>
-  <ve-pie :data="chartData" :legend="legend" :extend="extend" :tooltip="tooltip" :settings="chartSettings"/>
+  <ve-pie
+    :data="data"
+    :settings="chartSettings"/>
 </template>
 
+
+
 <script>
-export default {
-  name: 'PieChart',
-  props: {
-    list: {
-      type: Array,
-      default() {
-        return []
+import { countByToilet, countByDay } from '@/api/statistics'
+  export default {
+    name: 'PieChart',
+    data() {
+      this.chartSettings = {
+        labelMap: {
+          'cleanNum': '清洁次数',
+          'staticDate': '时间'
+        },
+        metrics: ['cleanNum'],
+        dimension: ['staticDate']
       }
-    }
-  },
-  data() {
-    this.extend = {
-      // series: {
-      //   label: {
-      //     normarl: { show: true, position: 'outside' }
-      //   }
-      //   // label: { show: true, position: 'right' }
-      // }
-    }
-    this.legend = {
-      bottom: '10px',
-      show: this.baseConfig.showLegend
-    }
-    this.tooltip = {
-      show: true
-    }
-    this.chartSettings = {
-      limitShowNum: this.baseConfig.pieChartLimit,
-      label: {
-        normal: {
-          show: true
+      this.extend = {}
+      return {
+        listQuery: {
+          staticType: '',
+          toiletId: '',
+          startTime: '',
+          endTime: ''
+        },
+        data: {
+          columns: ['staticDate', 'cleanNum'],
+          rows: []
         }
       }
-      // labelMap: {
-      //   'deptName': '单位/部门',
-      //   'num': '记录数'
-      // },
-      // dimension: ['deptName'],
-      // metrics: ['num']
-    }
-    return {
-      chartData: {
-        columns: ['typeName', 'count'],
-        rows: []
+    },
+    methods: {
+      fetchData(params){
+        this.listQuery = params
+        countByDay(this.listQuery).then(response => {
+          this.data.rows = response.data
+        })
       }
     }
-  },
-  watch: {
-    list(val) {
-      this.chartData.rows = val
-    }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/statistics/workStatistics.vue b/src/views/statistics/workStatistics.vue
new file mode 100644
index 0000000..7d3e329
--- /dev/null
+++ b/src/views/statistics/workStatistics.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="app-container">
+      <div class="statistic-container">
+        <el-row class="chart-tools">
+          <el-col :span="5" >
+            <el-date-picker
+              v-model="year"
+              type="year"
+              placeholder="请选择统计年份"
+              value-format="yyyy"
+              size="small"
+              @change="fetchData1"/>
+          </el-col>
+          <el-col :span="5">
+            <el-date-picker
+              v-model="month"
+              type="month"
+              placeholder="请选择统计年月"
+              value-format="yyyy-MM"
+              size="small"
+              @change="fetchData1"/>
+          </el-col>
+          <el-col :span="5">
+            <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>
+          </el-col>
+        </el-row>
+        <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>
+  </div>
+</template>
+
+<script>
+import { countByToilet, countByDay } from '@/api/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>
+  .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
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/views/toilet/components/detail.vue b/src/views/toilet/components/detail.vue
new file mode 100644
index 0000000..89f2815
--- /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/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..a7caa86
--- /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/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..266ee8d
--- /dev/null
+++ b/src/views/toilet/listToilet.vue
@@ -0,0 +1,249 @@
+<template>
+  <div class="app-container">
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-form-item prop="keywords">
+          <el-input v-model.trim="listQuery.keywords" placeholder="公厕编号/名称" clearable/>
+        </el-form-item>
+        <el-form-item prop="owner">
+          <el-input v-model.trim="listQuery.owner" placeholder="建设单位" clearable/>
+        </el-form-item>
+        <el-form-item prop="position">
+          <el-input v-model.trim="listQuery.position" placeholder="位置" clearable/>
+        </el-form-item>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>
+        <!--</el-row>-->
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button :disabled="total===0" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button class="edit_btn" size="small" @click="add">新增</el-button>
+        </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">
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="210" align="center">
+          <template slot-scope="scope">
+            <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
+            <el-button type="warning" size="mini" @click="edit(scope.row)">编辑</el-button>
+            <el-button type="danger" size="mini" @click="del(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>
+    <edit-toilet v-show="editShow" ref="edittoilet" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import { getToiletList, delToilet } from '@/api/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 // 是否显示编辑框
+    }
+  },
+  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..0e5d085
--- /dev/null
+++ b/src/views/toilet/listWork.vue
@@ -0,0 +1,205 @@
+<template>
+  <app-container>
+    <search-area :need-clear="false" :need-search-more="false" type="default" @search="fetchData" @clear="clearInput">
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.tolietKeywords" placeholder="公厕编号/名称" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="作业人" clearable/>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.jobContent" placeholder="作业内容" clearable/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable/>
+      </search-item>
+    </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/NomalTable'
+  import AppContainer from '@/components/layout/AppContainer'
+  import SearchArea from '@/components/SearchArea/SearchArea'
+  import SearchItem from '@/components/SearchArea/SearchItem'
+  import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/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/static/project.config.json b/static/project.config.json
index e294b08..73a7460 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,11 +1,11 @@
 {
-  "title": "路桥养护子系统",
-  "baseUrl": "http://192.168.1.108:8083/",
-  "mainPage": "http://111.198.10.15:11404/dcms/",
-  "singleSys": true,
+  "title": "基础资源系统",
+  "baseUrl": "http://111.198.10.15:11409/",
+  "mainPage": "http://111.198.10.15:11404/dcms/#",
+  "singleSys": false,
   "city":"崇仁县",
   "mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8",
   "labelUrl":"https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8",
   "center":[27.75962, 116.06021],
-  "zoom":15
+  "zoom":13
 }