diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 2ca7549..ffeac18 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -11,3 +11,12 @@
     params
   })
 }
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}

diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 2ca7549..ffeac18 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -11,3 +11,12 @@
     params
   })
 }
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 74181bc..11affd4 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -53,18 +53,17 @@
 }
 
 // 公厕基本信息详情
-export function getToiletInfoDetail(params) {
+export function getToiletInfoDetail(id) {
   return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
   })
 }
 
 // 某公厕保洁记录
 export function getRecordsByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toilet/jobRecord/detail',
     method: 'get',
     params
   })
@@ -73,12 +72,22 @@
 // 某公厕平均评分
 export function getScoreByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toiletEvaluation/detailScore',
     method: 'get',
     params
   })
 }
 
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
 // 批量导入
 export function batchImportToilet(fileobj) {
   const param = new FormData()

diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 2ca7549..ffeac18 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -11,3 +11,12 @@
     params
   })
 }
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 74181bc..11affd4 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -53,18 +53,17 @@
 }
 
 // 公厕基本信息详情
-export function getToiletInfoDetail(params) {
+export function getToiletInfoDetail(id) {
   return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
   })
 }
 
 // 某公厕保洁记录
 export function getRecordsByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toilet/jobRecord/detail',
     method: 'get',
     params
   })
@@ -73,12 +72,22 @@
 // 某公厕平均评分
 export function getScoreByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toiletEvaluation/detailScore',
     method: 'get',
     params
   })
 }
 
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
 // 批量导入
 export function batchImportToilet(fileobj) {
   const param = new FormData()
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
index 931a5e9..b753cc0 100644
--- a/src/components/mapWindow/leafletMap.vue
+++ b/src/components/mapWindow/leafletMap.vue
@@ -11,6 +11,16 @@
 
 export default {
   name: 'LeafletMap',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
   data() {
     return {
       map: null,
@@ -53,9 +63,10 @@
   },
   methods: {
     initMap() {
+      const { minZoom, maxZoom } = this
       const map = L.map(this.$refs.mapDiv, {
-        minZoom: 14,
-        maxZoom: 25,
+        minZoom: minZoom,
+        maxZoom: maxZoom,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,

diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 2ca7549..ffeac18 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -11,3 +11,12 @@
     params
   })
 }
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 74181bc..11affd4 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -53,18 +53,17 @@
 }
 
 // 公厕基本信息详情
-export function getToiletInfoDetail(params) {
+export function getToiletInfoDetail(id) {
   return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
   })
 }
 
 // 某公厕保洁记录
 export function getRecordsByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toilet/jobRecord/detail',
     method: 'get',
     params
   })
@@ -73,12 +72,22 @@
 // 某公厕平均评分
 export function getScoreByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toiletEvaluation/detailScore',
     method: 'get',
     params
   })
 }
 
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
 // 批量导入
 export function batchImportToilet(fileobj) {
   const param = new FormData()
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
index 931a5e9..b753cc0 100644
--- a/src/components/mapWindow/leafletMap.vue
+++ b/src/components/mapWindow/leafletMap.vue
@@ -11,6 +11,16 @@
 
 export default {
   name: 'LeafletMap',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
   data() {
     return {
       map: null,
@@ -53,9 +63,10 @@
   },
   methods: {
     initMap() {
+      const { minZoom, maxZoom } = this
       const map = L.map(this.$refs.mapDiv, {
-        minZoom: 14,
-        maxZoom: 25,
+        minZoom: minZoom,
+        maxZoom: maxZoom,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
index 167d65e..def17bb 100644
--- a/src/views/overview/toiletDetailDialog.vue
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -114,8 +114,8 @@
       dialogFormVisible: false,
       listQuery: {
         toiletId: '',
-        beginDate: '', // 开始时间
-        endDate: '', // 结束时间
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
         offset: 1,
         limit: 5
       }, // 筛选条件
@@ -168,8 +168,8 @@
       this.title = item.name + '详情'
       this.listQuery = {
         toiletId: item.id,
-        beginDate: getLastMonth('yyyy-MM-dd'),
-        endDate: getToday('yyyy-MM-dd'),
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
         offset: 1,
         limit: 5
       }
@@ -187,15 +187,17 @@
     },
     // 保洁记录
     fetchCleanRecords() {
+      this.listLoading = true
       getRecordsByToilet(this.listQuery).then((res) => {
-        this.listLoading = true
-        this.list = [
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
-        ]
-        this.total = 4
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
         this.listLoading = false
       })
     },
@@ -203,8 +205,7 @@
     fetchScoreData() {
       getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
         if (res.code === 200) {
-          // this.score = res.data
-          this.score = 4.5
+          this.score = res.data
         }
       })
     },

diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 2ca7549..ffeac18 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -11,3 +11,12 @@
     params
   })
 }
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 74181bc..11affd4 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -53,18 +53,17 @@
 }
 
 // 公厕基本信息详情
-export function getToiletInfoDetail(params) {
+export function getToiletInfoDetail(id) {
   return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
   })
 }
 
 // 某公厕保洁记录
 export function getRecordsByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toilet/jobRecord/detail',
     method: 'get',
     params
   })
@@ -73,12 +72,22 @@
 // 某公厕平均评分
 export function getScoreByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toiletEvaluation/detailScore',
     method: 'get',
     params
   })
 }
 
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
 // 批量导入
 export function batchImportToilet(fileobj) {
   const param = new FormData()
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
index 931a5e9..b753cc0 100644
--- a/src/components/mapWindow/leafletMap.vue
+++ b/src/components/mapWindow/leafletMap.vue
@@ -11,6 +11,16 @@
 
 export default {
   name: 'LeafletMap',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
   data() {
     return {
       map: null,
@@ -53,9 +63,10 @@
   },
   methods: {
     initMap() {
+      const { minZoom, maxZoom } = this
       const map = L.map(this.$refs.mapDiv, {
-        minZoom: 14,
-        maxZoom: 25,
+        minZoom: minZoom,
+        maxZoom: maxZoom,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
index 167d65e..def17bb 100644
--- a/src/views/overview/toiletDetailDialog.vue
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -114,8 +114,8 @@
       dialogFormVisible: false,
       listQuery: {
         toiletId: '',
-        beginDate: '', // 开始时间
-        endDate: '', // 结束时间
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
         offset: 1,
         limit: 5
       }, // 筛选条件
@@ -168,8 +168,8 @@
       this.title = item.name + '详情'
       this.listQuery = {
         toiletId: item.id,
-        beginDate: getLastMonth('yyyy-MM-dd'),
-        endDate: getToday('yyyy-MM-dd'),
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
         offset: 1,
         limit: 5
       }
@@ -187,15 +187,17 @@
     },
     // 保洁记录
     fetchCleanRecords() {
+      this.listLoading = true
       getRecordsByToilet(this.listQuery).then((res) => {
-        this.listLoading = true
-        this.list = [
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
-        ]
-        this.total = 4
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
         this.listLoading = false
       })
     },
@@ -203,8 +205,7 @@
     fetchScoreData() {
       getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
         if (res.code === 200) {
-          // this.score = res.data
-          this.score = 4.5
+          this.score = res.data
         }
       })
     },
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
index d5b4191..bb4cbda 100644
--- a/src/views/overview/toiletLayer.vue
+++ b/src/views/overview/toiletLayer.vue
@@ -102,8 +102,8 @@
       })
     },
     // 将点加到地图上
-    addPointOnMap: function(itemList, staffLayer, iconType) {
-      const { iconSize, iconAnchor, popupAnchor } = this
+    addPointOnMap: function(itemList, layer, iconType) {
+      const { map, iconSize, iconAnchor, popupAnchor } = this
       // 图标
       const icon = Leaflet.icon({
         iconUrl: iconType,
@@ -121,15 +121,18 @@
           '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
           '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
           '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
-          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail' + item.code + '">详情</button></div>' +
           '</div>'
 
         const popup = Leaflet.popup().setContent(popupStr)
         if (item.lng > 0 && item.lat > 0) {
           // 添加marker
-          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon , item: item}).addTo(staffLayer).bindPopup(popup)
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
           marker.on('click', (e) => {
-            document.getElementById('detail').onclick = () => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
               console.log('click detail')
               this.detail(e.sourceTarget.options.item)
             }

diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 2ca7549..ffeac18 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -11,3 +11,12 @@
     params
   })
 }
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 74181bc..11affd4 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -53,18 +53,17 @@
 }
 
 // 公厕基本信息详情
-export function getToiletInfoDetail(params) {
+export function getToiletInfoDetail(id) {
   return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
   })
 }
 
 // 某公厕保洁记录
 export function getRecordsByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toilet/jobRecord/detail',
     method: 'get',
     params
   })
@@ -73,12 +72,22 @@
 // 某公厕平均评分
 export function getScoreByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toiletEvaluation/detailScore',
     method: 'get',
     params
   })
 }
 
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
 // 批量导入
 export function batchImportToilet(fileobj) {
   const param = new FormData()
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
index 931a5e9..b753cc0 100644
--- a/src/components/mapWindow/leafletMap.vue
+++ b/src/components/mapWindow/leafletMap.vue
@@ -11,6 +11,16 @@
 
 export default {
   name: 'LeafletMap',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
   data() {
     return {
       map: null,
@@ -53,9 +63,10 @@
   },
   methods: {
     initMap() {
+      const { minZoom, maxZoom } = this
       const map = L.map(this.$refs.mapDiv, {
-        minZoom: 14,
-        maxZoom: 25,
+        minZoom: minZoom,
+        maxZoom: maxZoom,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
index 167d65e..def17bb 100644
--- a/src/views/overview/toiletDetailDialog.vue
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -114,8 +114,8 @@
       dialogFormVisible: false,
       listQuery: {
         toiletId: '',
-        beginDate: '', // 开始时间
-        endDate: '', // 结束时间
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
         offset: 1,
         limit: 5
       }, // 筛选条件
@@ -168,8 +168,8 @@
       this.title = item.name + '详情'
       this.listQuery = {
         toiletId: item.id,
-        beginDate: getLastMonth('yyyy-MM-dd'),
-        endDate: getToday('yyyy-MM-dd'),
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
         offset: 1,
         limit: 5
       }
@@ -187,15 +187,17 @@
     },
     // 保洁记录
     fetchCleanRecords() {
+      this.listLoading = true
       getRecordsByToilet(this.listQuery).then((res) => {
-        this.listLoading = true
-        this.list = [
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
-        ]
-        this.total = 4
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
         this.listLoading = false
       })
     },
@@ -203,8 +205,7 @@
     fetchScoreData() {
       getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
         if (res.code === 200) {
-          // this.score = res.data
-          this.score = 4.5
+          this.score = res.data
         }
       })
     },
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
index d5b4191..bb4cbda 100644
--- a/src/views/overview/toiletLayer.vue
+++ b/src/views/overview/toiletLayer.vue
@@ -102,8 +102,8 @@
       })
     },
     // 将点加到地图上
-    addPointOnMap: function(itemList, staffLayer, iconType) {
-      const { iconSize, iconAnchor, popupAnchor } = this
+    addPointOnMap: function(itemList, layer, iconType) {
+      const { map, iconSize, iconAnchor, popupAnchor } = this
       // 图标
       const icon = Leaflet.icon({
         iconUrl: iconType,
@@ -121,15 +121,18 @@
           '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
           '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
           '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
-          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail' + item.code + '">详情</button></div>' +
           '</div>'
 
         const popup = Leaflet.popup().setContent(popupStr)
         if (item.lng > 0 && item.lat > 0) {
           // 添加marker
-          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon , item: item}).addTo(staffLayer).bindPopup(popup)
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
           marker.on('click', (e) => {
-            document.getElementById('detail').onclick = () => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
               console.log('click detail')
               this.detail(e.sourceTarget.options.item)
             }
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
index 15a9c2f..1560772 100644
--- a/src/views/statistics/components/evaluationListDialog.vue
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+import { getScoreListByToilet } from '@/api/sanitation/toilet'
 export default {
   name: 'EvaluationListDialog',
   data() {
@@ -65,13 +65,17 @@
     },
     fetchData() {
       this.listLoading = true
-      this.list = [
-        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
-      ]
-      this.total = 4
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // this.list = [
+      //   { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      // ]
+      // this.total = 4
       this.listLoading = false
     },
     cancel: function() {
@@ -93,28 +97,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .form-div{
-    width:100%;
-    height:100%;
-    display:flex;
-    justify-content: space-between;
-  }
-  .form-left{
-    flex:1;
-    height:100%;
-  }
-  .form-right{
-    width: 180px;
-    height:100%;
-    .avatar{
-      margin-bottom: 10px;
-    }
-    text-align: center;
-  }
 </style>

diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 2ca7549..ffeac18 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -11,3 +11,12 @@
     params
   })
 }
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 74181bc..11affd4 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -53,18 +53,17 @@
 }
 
 // 公厕基本信息详情
-export function getToiletInfoDetail(params) {
+export function getToiletInfoDetail(id) {
   return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
   })
 }
 
 // 某公厕保洁记录
 export function getRecordsByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toilet/jobRecord/detail',
     method: 'get',
     params
   })
@@ -73,12 +72,22 @@
 // 某公厕平均评分
 export function getScoreByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toiletEvaluation/detailScore',
     method: 'get',
     params
   })
 }
 
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
 // 批量导入
 export function batchImportToilet(fileobj) {
   const param = new FormData()
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
index 931a5e9..b753cc0 100644
--- a/src/components/mapWindow/leafletMap.vue
+++ b/src/components/mapWindow/leafletMap.vue
@@ -11,6 +11,16 @@
 
 export default {
   name: 'LeafletMap',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
   data() {
     return {
       map: null,
@@ -53,9 +63,10 @@
   },
   methods: {
     initMap() {
+      const { minZoom, maxZoom } = this
       const map = L.map(this.$refs.mapDiv, {
-        minZoom: 14,
-        maxZoom: 25,
+        minZoom: minZoom,
+        maxZoom: maxZoom,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
index 167d65e..def17bb 100644
--- a/src/views/overview/toiletDetailDialog.vue
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -114,8 +114,8 @@
       dialogFormVisible: false,
       listQuery: {
         toiletId: '',
-        beginDate: '', // 开始时间
-        endDate: '', // 结束时间
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
         offset: 1,
         limit: 5
       }, // 筛选条件
@@ -168,8 +168,8 @@
       this.title = item.name + '详情'
       this.listQuery = {
         toiletId: item.id,
-        beginDate: getLastMonth('yyyy-MM-dd'),
-        endDate: getToday('yyyy-MM-dd'),
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
         offset: 1,
         limit: 5
       }
@@ -187,15 +187,17 @@
     },
     // 保洁记录
     fetchCleanRecords() {
+      this.listLoading = true
       getRecordsByToilet(this.listQuery).then((res) => {
-        this.listLoading = true
-        this.list = [
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
-        ]
-        this.total = 4
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
         this.listLoading = false
       })
     },
@@ -203,8 +205,7 @@
     fetchScoreData() {
       getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
         if (res.code === 200) {
-          // this.score = res.data
-          this.score = 4.5
+          this.score = res.data
         }
       })
     },
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
index d5b4191..bb4cbda 100644
--- a/src/views/overview/toiletLayer.vue
+++ b/src/views/overview/toiletLayer.vue
@@ -102,8 +102,8 @@
       })
     },
     // 将点加到地图上
-    addPointOnMap: function(itemList, staffLayer, iconType) {
-      const { iconSize, iconAnchor, popupAnchor } = this
+    addPointOnMap: function(itemList, layer, iconType) {
+      const { map, iconSize, iconAnchor, popupAnchor } = this
       // 图标
       const icon = Leaflet.icon({
         iconUrl: iconType,
@@ -121,15 +121,18 @@
           '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
           '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
           '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
-          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail' + item.code + '">详情</button></div>' +
           '</div>'
 
         const popup = Leaflet.popup().setContent(popupStr)
         if (item.lng > 0 && item.lat > 0) {
           // 添加marker
-          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon , item: item}).addTo(staffLayer).bindPopup(popup)
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
           marker.on('click', (e) => {
-            document.getElementById('detail').onclick = () => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
               console.log('click detail')
               this.detail(e.sourceTarget.options.item)
             }
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
index 15a9c2f..1560772 100644
--- a/src/views/statistics/components/evaluationListDialog.vue
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+import { getScoreListByToilet } from '@/api/sanitation/toilet'
 export default {
   name: 'EvaluationListDialog',
   data() {
@@ -65,13 +65,17 @@
     },
     fetchData() {
       this.listLoading = true
-      this.list = [
-        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
-      ]
-      this.total = 4
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // this.list = [
+      //   { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      // ]
+      // this.total = 4
       this.listLoading = false
     },
     cancel: function() {
@@ -93,28 +97,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .form-div{
-    width:100%;
-    height:100%;
-    display:flex;
-    justify-content: space-between;
-  }
-  .form-left{
-    flex:1;
-    height:100%;
-  }
-  .form-right{
-    width: 180px;
-    height:100%;
-    .avatar{
-      margin-bottom: 10px;
-    }
-    text-align: center;
-  }
 </style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
index 2193f0e..28dedc5 100644
--- a/src/views/statistics/evaluationAssessment.vue
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -1,7 +1,7 @@
 <!--评价统计-->
 <template>
   <app-container>
-    <search-area @search="searchByMonth">
+    <search-area @search="fetchData">
       <search-item>
         <el-date-picker
           v-model="timeRange"
@@ -37,8 +37,7 @@
               disabled
               show-score
               text-color="#ff9900"
-              score-template="{value}">
-            </el-rate>
+              score-template="{value}"/>
           </template>
         </el-table-column>
         <el-table-column label="详细记录" width="100" align="center">
@@ -55,15 +54,14 @@
 <script>
 import FileSaver from 'file-saver'
 import XLSX from 'xlsx'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getToday, getLastMonth } from '@/utils/dateutils'
+import { getToiletEvaluation } from '@/api/sanitation/statistics'
 import EvaluationListDialog from './components/evaluationListDialog'
 export default {
   name: 'ToiletAssessment',
   components: { EvaluationListDialog },
   data() {
     return {
-      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      timeRange: [], // 按日统计面板中的日期范围
       listQuery: {
         beginDate: '', // 开始时间
         endDate: '' // 结束时间
@@ -94,36 +92,36 @@
     }
   },
   created() {
-    this.searchByMonth()
+    this.fetchData()
   },
   methods: {
-    searchByMonth() {
-      this.listLoading = true
-      this.list = [
-        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
-        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
-        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
-        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
-      ]
-      this.listLoading = false
-    },
     // 获取数据
     fetchData() {
       this.listLoading = true
-      getToiletJobCount(this.listQuery).then(response => {
-        this.list = response.data
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
         this.total = response.data.length
         this.listLoading = false
       })
     },
     // 评价记录详情列表
-    showDetail(id,name) {
+    showDetail(id, name) {
       const listQuery = {
         beginDate: this.listQuery.beginDate,
         endDate: this.listQuery.endDate,
         toiletId: id
       }
-      this.$refs.evaluationList.initDialog(listQuery,name)
+      this.$refs.evaluationList.initDialog(listQuery, name)
     },
     // 批量导出
     batchExport() {

diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 2ca7549..ffeac18 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -11,3 +11,12 @@
     params
   })
 }
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 74181bc..11affd4 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -53,18 +53,17 @@
 }
 
 // 公厕基本信息详情
-export function getToiletInfoDetail(params) {
+export function getToiletInfoDetail(id) {
   return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
   })
 }
 
 // 某公厕保洁记录
 export function getRecordsByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toilet/jobRecord/detail',
     method: 'get',
     params
   })
@@ -73,12 +72,22 @@
 // 某公厕平均评分
 export function getScoreByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toiletEvaluation/detailScore',
     method: 'get',
     params
   })
 }
 
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
 // 批量导入
 export function batchImportToilet(fileobj) {
   const param = new FormData()
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
index 931a5e9..b753cc0 100644
--- a/src/components/mapWindow/leafletMap.vue
+++ b/src/components/mapWindow/leafletMap.vue
@@ -11,6 +11,16 @@
 
 export default {
   name: 'LeafletMap',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
   data() {
     return {
       map: null,
@@ -53,9 +63,10 @@
   },
   methods: {
     initMap() {
+      const { minZoom, maxZoom } = this
       const map = L.map(this.$refs.mapDiv, {
-        minZoom: 14,
-        maxZoom: 25,
+        minZoom: minZoom,
+        maxZoom: maxZoom,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
index 167d65e..def17bb 100644
--- a/src/views/overview/toiletDetailDialog.vue
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -114,8 +114,8 @@
       dialogFormVisible: false,
       listQuery: {
         toiletId: '',
-        beginDate: '', // 开始时间
-        endDate: '', // 结束时间
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
         offset: 1,
         limit: 5
       }, // 筛选条件
@@ -168,8 +168,8 @@
       this.title = item.name + '详情'
       this.listQuery = {
         toiletId: item.id,
-        beginDate: getLastMonth('yyyy-MM-dd'),
-        endDate: getToday('yyyy-MM-dd'),
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
         offset: 1,
         limit: 5
       }
@@ -187,15 +187,17 @@
     },
     // 保洁记录
     fetchCleanRecords() {
+      this.listLoading = true
       getRecordsByToilet(this.listQuery).then((res) => {
-        this.listLoading = true
-        this.list = [
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
-        ]
-        this.total = 4
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
         this.listLoading = false
       })
     },
@@ -203,8 +205,7 @@
     fetchScoreData() {
       getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
         if (res.code === 200) {
-          // this.score = res.data
-          this.score = 4.5
+          this.score = res.data
         }
       })
     },
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
index d5b4191..bb4cbda 100644
--- a/src/views/overview/toiletLayer.vue
+++ b/src/views/overview/toiletLayer.vue
@@ -102,8 +102,8 @@
       })
     },
     // 将点加到地图上
-    addPointOnMap: function(itemList, staffLayer, iconType) {
-      const { iconSize, iconAnchor, popupAnchor } = this
+    addPointOnMap: function(itemList, layer, iconType) {
+      const { map, iconSize, iconAnchor, popupAnchor } = this
       // 图标
       const icon = Leaflet.icon({
         iconUrl: iconType,
@@ -121,15 +121,18 @@
           '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
           '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
           '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
-          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail' + item.code + '">详情</button></div>' +
           '</div>'
 
         const popup = Leaflet.popup().setContent(popupStr)
         if (item.lng > 0 && item.lat > 0) {
           // 添加marker
-          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon , item: item}).addTo(staffLayer).bindPopup(popup)
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
           marker.on('click', (e) => {
-            document.getElementById('detail').onclick = () => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
               console.log('click detail')
               this.detail(e.sourceTarget.options.item)
             }
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
index 15a9c2f..1560772 100644
--- a/src/views/statistics/components/evaluationListDialog.vue
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+import { getScoreListByToilet } from '@/api/sanitation/toilet'
 export default {
   name: 'EvaluationListDialog',
   data() {
@@ -65,13 +65,17 @@
     },
     fetchData() {
       this.listLoading = true
-      this.list = [
-        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
-      ]
-      this.total = 4
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // this.list = [
+      //   { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      // ]
+      // this.total = 4
       this.listLoading = false
     },
     cancel: function() {
@@ -93,28 +97,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .form-div{
-    width:100%;
-    height:100%;
-    display:flex;
-    justify-content: space-between;
-  }
-  .form-left{
-    flex:1;
-    height:100%;
-  }
-  .form-right{
-    width: 180px;
-    height:100%;
-    .avatar{
-      margin-bottom: 10px;
-    }
-    text-align: center;
-  }
 </style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
index 2193f0e..28dedc5 100644
--- a/src/views/statistics/evaluationAssessment.vue
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -1,7 +1,7 @@
 <!--评价统计-->
 <template>
   <app-container>
-    <search-area @search="searchByMonth">
+    <search-area @search="fetchData">
       <search-item>
         <el-date-picker
           v-model="timeRange"
@@ -37,8 +37,7 @@
               disabled
               show-score
               text-color="#ff9900"
-              score-template="{value}">
-            </el-rate>
+              score-template="{value}"/>
           </template>
         </el-table-column>
         <el-table-column label="详细记录" width="100" align="center">
@@ -55,15 +54,14 @@
 <script>
 import FileSaver from 'file-saver'
 import XLSX from 'xlsx'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getToday, getLastMonth } from '@/utils/dateutils'
+import { getToiletEvaluation } from '@/api/sanitation/statistics'
 import EvaluationListDialog from './components/evaluationListDialog'
 export default {
   name: 'ToiletAssessment',
   components: { EvaluationListDialog },
   data() {
     return {
-      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      timeRange: [], // 按日统计面板中的日期范围
       listQuery: {
         beginDate: '', // 开始时间
         endDate: '' // 结束时间
@@ -94,36 +92,36 @@
     }
   },
   created() {
-    this.searchByMonth()
+    this.fetchData()
   },
   methods: {
-    searchByMonth() {
-      this.listLoading = true
-      this.list = [
-        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
-        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
-        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
-        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
-      ]
-      this.listLoading = false
-    },
     // 获取数据
     fetchData() {
       this.listLoading = true
-      getToiletJobCount(this.listQuery).then(response => {
-        this.list = response.data
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
         this.total = response.data.length
         this.listLoading = false
       })
     },
     // 评价记录详情列表
-    showDetail(id,name) {
+    showDetail(id, name) {
       const listQuery = {
         beginDate: this.listQuery.beginDate,
         endDate: this.listQuery.endDate,
         toiletId: id
       }
-      this.$refs.evaluationList.initDialog(listQuery,name)
+      this.$refs.evaluationList.initDialog(listQuery, name)
     },
     // 批量导出
     batchExport() {
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
index 2b8522a..67aa32b 100644
--- a/src/views/statistics/toiletAssessment.vue
+++ b/src/views/statistics/toiletAssessment.vue
@@ -168,8 +168,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [

diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 2ca7549..ffeac18 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -11,3 +11,12 @@
     params
   })
 }
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 74181bc..11affd4 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -53,18 +53,17 @@
 }
 
 // 公厕基本信息详情
-export function getToiletInfoDetail(params) {
+export function getToiletInfoDetail(id) {
   return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
   })
 }
 
 // 某公厕保洁记录
 export function getRecordsByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toilet/jobRecord/detail',
     method: 'get',
     params
   })
@@ -73,12 +72,22 @@
 // 某公厕平均评分
 export function getScoreByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toiletEvaluation/detailScore',
     method: 'get',
     params
   })
 }
 
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
 // 批量导入
 export function batchImportToilet(fileobj) {
   const param = new FormData()
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
index 931a5e9..b753cc0 100644
--- a/src/components/mapWindow/leafletMap.vue
+++ b/src/components/mapWindow/leafletMap.vue
@@ -11,6 +11,16 @@
 
 export default {
   name: 'LeafletMap',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
   data() {
     return {
       map: null,
@@ -53,9 +63,10 @@
   },
   methods: {
     initMap() {
+      const { minZoom, maxZoom } = this
       const map = L.map(this.$refs.mapDiv, {
-        minZoom: 14,
-        maxZoom: 25,
+        minZoom: minZoom,
+        maxZoom: maxZoom,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
index 167d65e..def17bb 100644
--- a/src/views/overview/toiletDetailDialog.vue
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -114,8 +114,8 @@
       dialogFormVisible: false,
       listQuery: {
         toiletId: '',
-        beginDate: '', // 开始时间
-        endDate: '', // 结束时间
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
         offset: 1,
         limit: 5
       }, // 筛选条件
@@ -168,8 +168,8 @@
       this.title = item.name + '详情'
       this.listQuery = {
         toiletId: item.id,
-        beginDate: getLastMonth('yyyy-MM-dd'),
-        endDate: getToday('yyyy-MM-dd'),
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
         offset: 1,
         limit: 5
       }
@@ -187,15 +187,17 @@
     },
     // 保洁记录
     fetchCleanRecords() {
+      this.listLoading = true
       getRecordsByToilet(this.listQuery).then((res) => {
-        this.listLoading = true
-        this.list = [
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
-        ]
-        this.total = 4
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
         this.listLoading = false
       })
     },
@@ -203,8 +205,7 @@
     fetchScoreData() {
       getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
         if (res.code === 200) {
-          // this.score = res.data
-          this.score = 4.5
+          this.score = res.data
         }
       })
     },
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
index d5b4191..bb4cbda 100644
--- a/src/views/overview/toiletLayer.vue
+++ b/src/views/overview/toiletLayer.vue
@@ -102,8 +102,8 @@
       })
     },
     // 将点加到地图上
-    addPointOnMap: function(itemList, staffLayer, iconType) {
-      const { iconSize, iconAnchor, popupAnchor } = this
+    addPointOnMap: function(itemList, layer, iconType) {
+      const { map, iconSize, iconAnchor, popupAnchor } = this
       // 图标
       const icon = Leaflet.icon({
         iconUrl: iconType,
@@ -121,15 +121,18 @@
           '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
           '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
           '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
-          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail' + item.code + '">详情</button></div>' +
           '</div>'
 
         const popup = Leaflet.popup().setContent(popupStr)
         if (item.lng > 0 && item.lat > 0) {
           // 添加marker
-          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon , item: item}).addTo(staffLayer).bindPopup(popup)
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
           marker.on('click', (e) => {
-            document.getElementById('detail').onclick = () => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
               console.log('click detail')
               this.detail(e.sourceTarget.options.item)
             }
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
index 15a9c2f..1560772 100644
--- a/src/views/statistics/components/evaluationListDialog.vue
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+import { getScoreListByToilet } from '@/api/sanitation/toilet'
 export default {
   name: 'EvaluationListDialog',
   data() {
@@ -65,13 +65,17 @@
     },
     fetchData() {
       this.listLoading = true
-      this.list = [
-        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
-      ]
-      this.total = 4
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // this.list = [
+      //   { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      // ]
+      // this.total = 4
       this.listLoading = false
     },
     cancel: function() {
@@ -93,28 +97,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .form-div{
-    width:100%;
-    height:100%;
-    display:flex;
-    justify-content: space-between;
-  }
-  .form-left{
-    flex:1;
-    height:100%;
-  }
-  .form-right{
-    width: 180px;
-    height:100%;
-    .avatar{
-      margin-bottom: 10px;
-    }
-    text-align: center;
-  }
 </style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
index 2193f0e..28dedc5 100644
--- a/src/views/statistics/evaluationAssessment.vue
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -1,7 +1,7 @@
 <!--评价统计-->
 <template>
   <app-container>
-    <search-area @search="searchByMonth">
+    <search-area @search="fetchData">
       <search-item>
         <el-date-picker
           v-model="timeRange"
@@ -37,8 +37,7 @@
               disabled
               show-score
               text-color="#ff9900"
-              score-template="{value}">
-            </el-rate>
+              score-template="{value}"/>
           </template>
         </el-table-column>
         <el-table-column label="详细记录" width="100" align="center">
@@ -55,15 +54,14 @@
 <script>
 import FileSaver from 'file-saver'
 import XLSX from 'xlsx'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getToday, getLastMonth } from '@/utils/dateutils'
+import { getToiletEvaluation } from '@/api/sanitation/statistics'
 import EvaluationListDialog from './components/evaluationListDialog'
 export default {
   name: 'ToiletAssessment',
   components: { EvaluationListDialog },
   data() {
     return {
-      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      timeRange: [], // 按日统计面板中的日期范围
       listQuery: {
         beginDate: '', // 开始时间
         endDate: '' // 结束时间
@@ -94,36 +92,36 @@
     }
   },
   created() {
-    this.searchByMonth()
+    this.fetchData()
   },
   methods: {
-    searchByMonth() {
-      this.listLoading = true
-      this.list = [
-        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
-        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
-        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
-        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
-      ]
-      this.listLoading = false
-    },
     // 获取数据
     fetchData() {
       this.listLoading = true
-      getToiletJobCount(this.listQuery).then(response => {
-        this.list = response.data
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
         this.total = response.data.length
         this.listLoading = false
       })
     },
     // 评价记录详情列表
-    showDetail(id,name) {
+    showDetail(id, name) {
       const listQuery = {
         beginDate: this.listQuery.beginDate,
         endDate: this.listQuery.endDate,
         toiletId: id
       }
-      this.$refs.evaluationList.initDialog(listQuery,name)
+      this.$refs.evaluationList.initDialog(listQuery, name)
     },
     // 批量导出
     batchExport() {
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
index 2b8522a..67aa32b 100644
--- a/src/views/statistics/toiletAssessment.vue
+++ b/src/views/statistics/toiletAssessment.vue
@@ -168,8 +168,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index 1e4af18..9dfc046 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -42,11 +42,13 @@
 
 <script>
 import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+
 export default {
   name: 'ToiletCleanList',
   data() {
     return {
-      dateRange: [], // 日期范围
+      dateRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 日期范围
       listQuery: {
         name: '', // 作业人
         jobContent: '', // 作业内容
@@ -124,7 +126,7 @@
       // ]
       // this.total = this.list.length
       // this.listLoading = false
-      if (this.dateRange.length > 0) {
+      if (this.dateRange && this.dateRange.length > 0) {
         this.listQuery.startTime = this.dateRange[0]
         this.listQuery.endTime = this.dateRange[1]
       } else {

diff --git a/src/api/sanitation/statistics.js b/src/api/sanitation/statistics.js
index 2ca7549..ffeac18 100644
--- a/src/api/sanitation/statistics.js
+++ b/src/api/sanitation/statistics.js
@@ -11,3 +11,12 @@
     params
   })
 }
+
+// 公厕评分统计
+export function getToiletEvaluation(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/statistics',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/api/sanitation/toilet.js b/src/api/sanitation/toilet.js
index 74181bc..11affd4 100644
--- a/src/api/sanitation/toilet.js
+++ b/src/api/sanitation/toilet.js
@@ -53,18 +53,17 @@
 }
 
 // 公厕基本信息详情
-export function getToiletInfoDetail(params) {
+export function getToiletInfoDetail(id) {
   return request({
-    url: '/sanitation/toilet/listPage',
-    method: 'get',
-    params
+    url: '/sanitation/toilet/detail?toiletId=' + id,
+    method: 'get'
   })
 }
 
 // 某公厕保洁记录
 export function getRecordsByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toilet/jobRecord/detail',
     method: 'get',
     params
   })
@@ -73,12 +72,22 @@
 // 某公厕平均评分
 export function getScoreByToilet(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/sanitation/toiletEvaluation/detailScore',
     method: 'get',
     params
   })
 }
 
+// 某公厕评分列表
+export function getScoreListByToilet(params) {
+  return request({
+    url: '/sanitation/toiletEvaluation/list',
+    method: 'get',
+    params
+  })
+}
+
+
 // 批量导入
 export function batchImportToilet(fileobj) {
   const param = new FormData()
diff --git a/src/components/mapWindow/leafletMap.vue b/src/components/mapWindow/leafletMap.vue
index 931a5e9..b753cc0 100644
--- a/src/components/mapWindow/leafletMap.vue
+++ b/src/components/mapWindow/leafletMap.vue
@@ -11,6 +11,16 @@
 
 export default {
   name: 'LeafletMap',
+  props: {
+    minZoom: {
+      type: Number,
+      default: 14
+    },
+    maxZoom: {
+      type: Number,
+      default: 18
+    }
+  },
   data() {
     return {
       map: null,
@@ -53,9 +63,10 @@
   },
   methods: {
     initMap() {
+      const { minZoom, maxZoom } = this
       const map = L.map(this.$refs.mapDiv, {
-        minZoom: 14,
-        maxZoom: 25,
+        minZoom: minZoom,
+        maxZoom: maxZoom,
         center: this.baseConfig.center,
         zoom: this.baseConfig.zoom,
         zoomControl: false,
diff --git a/src/views/overview/toiletDetailDialog.vue b/src/views/overview/toiletDetailDialog.vue
index 167d65e..def17bb 100644
--- a/src/views/overview/toiletDetailDialog.vue
+++ b/src/views/overview/toiletDetailDialog.vue
@@ -114,8 +114,8 @@
       dialogFormVisible: false,
       listQuery: {
         toiletId: '',
-        beginDate: '', // 开始时间
-        endDate: '', // 结束时间
+        startTime: '', // 开始时间
+        endTime: '', // 结束时间
         offset: 1,
         limit: 5
       }, // 筛选条件
@@ -168,8 +168,8 @@
       this.title = item.name + '详情'
       this.listQuery = {
         toiletId: item.id,
-        beginDate: getLastMonth('yyyy-MM-dd'),
-        endDate: getToday('yyyy-MM-dd'),
+        startTime: getLastMonth('yyyy-MM-dd') + ' 00:00:00',
+        endTime: getToday('yyyy-MM-dd') + ' 23:59:59',
         offset: 1,
         limit: 5
       }
@@ -187,15 +187,17 @@
     },
     // 保洁记录
     fetchCleanRecords() {
+      this.listLoading = true
       getRecordsByToilet(this.listQuery).then((res) => {
-        this.listLoading = true
-        this.list = [
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
-          { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
-        ]
-        this.total = 4
+        this.list = res.data.rows
+        this.total = res.data.total
+        // this.list = [
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-01 08:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-02 09:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-03 10:00:00' },
+        //   { name: '张三', jobContent: '保洁', startTime: '2021-07-04 11:00:00' }
+        // ]
+        // this.total = 4
         this.listLoading = false
       })
     },
@@ -203,8 +205,7 @@
     fetchScoreData() {
       getScoreByToilet({ toiletId: this.listQuery.toiletId }).then(res => {
         if (res.code === 200) {
-          // this.score = res.data
-          this.score = 4.5
+          this.score = res.data
         }
       })
     },
diff --git a/src/views/overview/toiletLayer.vue b/src/views/overview/toiletLayer.vue
index d5b4191..bb4cbda 100644
--- a/src/views/overview/toiletLayer.vue
+++ b/src/views/overview/toiletLayer.vue
@@ -102,8 +102,8 @@
       })
     },
     // 将点加到地图上
-    addPointOnMap: function(itemList, staffLayer, iconType) {
-      const { iconSize, iconAnchor, popupAnchor } = this
+    addPointOnMap: function(itemList, layer, iconType) {
+      const { map, iconSize, iconAnchor, popupAnchor } = this
       // 图标
       const icon = Leaflet.icon({
         iconUrl: iconType,
@@ -121,15 +121,18 @@
           '<div class="popup-item"><label>负责人</label>' + item.responsiblePerson + '</div>' +
           '<div class="popup-item"><label>占地面积</label>' + item.area + '</div>' +
           '<div class="popup-item"><label>建设时间</label>' + item.ts + '</div>' +
-          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail">详情</button></div>' +
+          '<div class="popup-button"><button class="detail-button" style="background-color: #42b983;border-width: 0px;color: white;padding: 5px 8px;font-size: 12px;border-radius: 4px" id="detail' + item.code + '">详情</button></div>' +
           '</div>'
 
         const popup = Leaflet.popup().setContent(popupStr)
         if (item.lng > 0 && item.lat > 0) {
           // 添加marker
-          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon , item: item}).addTo(staffLayer).bindPopup(popup)
+          const marker = Leaflet.marker([item.lat, item.lng], { icon: icon, item: item }).addTo(layer).bindPopup(popup)
           marker.on('click', (e) => {
-            document.getElementById('detail').onclick = () => {
+            console.log('marker on click' + item.code)
+            const btn = document.getElementById('detail' + item.code)
+            console.log(btn)
+            btn.onclick = () => {
               console.log('click detail')
               this.detail(e.sourceTarget.options.item)
             }
diff --git a/src/views/statistics/components/evaluationListDialog.vue b/src/views/statistics/components/evaluationListDialog.vue
index 15a9c2f..1560772 100644
--- a/src/views/statistics/components/evaluationListDialog.vue
+++ b/src/views/statistics/components/evaluationListDialog.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { addToilet, updateToilet } from '@/api/sanitation/toilet'
+import { getScoreListByToilet } from '@/api/sanitation/toilet'
 export default {
   name: 'EvaluationListDialog',
   data() {
@@ -65,13 +65,17 @@
     },
     fetchData() {
       this.listLoading = true
-      this.list = [
-        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
-        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
-      ]
-      this.total = 4
+      getScoreListByToilet(this.listQuery).then(res => {
+        this.list = res.data.rows
+        this.total = res.data.total
+      })
+      // this.list = [
+      //   { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', score: 5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', score: 4, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' },
+      //   { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', score: 4.5, commentTime: '2021-06-30 00:00:00', comment: '干净卫生' }
+      // ]
+      // this.total = 4
       this.listLoading = false
     },
     cancel: function() {
@@ -93,28 +97,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-  .form-div{
-    width:100%;
-    height:100%;
-    display:flex;
-    justify-content: space-between;
-  }
-  .form-left{
-    flex:1;
-    height:100%;
-  }
-  .form-right{
-    width: 180px;
-    height:100%;
-    .avatar{
-      margin-bottom: 10px;
-    }
-    text-align: center;
-  }
 </style>
diff --git a/src/views/statistics/evaluationAssessment.vue b/src/views/statistics/evaluationAssessment.vue
index 2193f0e..28dedc5 100644
--- a/src/views/statistics/evaluationAssessment.vue
+++ b/src/views/statistics/evaluationAssessment.vue
@@ -1,7 +1,7 @@
 <!--评价统计-->
 <template>
   <app-container>
-    <search-area @search="searchByMonth">
+    <search-area @search="fetchData">
       <search-item>
         <el-date-picker
           v-model="timeRange"
@@ -37,8 +37,7 @@
               disabled
               show-score
               text-color="#ff9900"
-              score-template="{value}">
-            </el-rate>
+              score-template="{value}"/>
           </template>
         </el-table-column>
         <el-table-column label="详细记录" width="100" align="center">
@@ -55,15 +54,14 @@
 <script>
 import FileSaver from 'file-saver'
 import XLSX from 'xlsx'
-import { getToiletJobCount } from '@/api/sanitation/statistics'
-import { getToday, getLastMonth } from '@/utils/dateutils'
+import { getToiletEvaluation } from '@/api/sanitation/statistics'
 import EvaluationListDialog from './components/evaluationListDialog'
 export default {
   name: 'ToiletAssessment',
   components: { EvaluationListDialog },
   data() {
     return {
-      timeRange: [getLastMonth('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 按日统计面板中的日期范围
+      timeRange: [], // 按日统计面板中的日期范围
       listQuery: {
         beginDate: '', // 开始时间
         endDate: '' // 结束时间
@@ -94,36 +92,36 @@
     }
   },
   created() {
-    this.searchByMonth()
+    this.fetchData()
   },
   methods: {
-    searchByMonth() {
-      this.listLoading = true
-      this.list = [
-        { toiletId: 1, toiletCode: '0001', toiletName: '公厕1号', avgScore: 5, recordsCount: 5 },
-        { toiletId: 2, toiletCode: '0001', toiletName: '公厕2号', avgScore: 4.5, recordsCount: 2 },
-        { toiletId: 3, toiletCode: '0001', toiletName: '公厕3号', avgScore: 4, recordsCount: 5 },
-        { toiletId: 4, toiletCode: '0001', toiletName: '公厕4号', avgScore: 3, recordsCount: 8 }
-      ]
-      this.listLoading = false
-    },
     // 获取数据
     fetchData() {
       this.listLoading = true
-      getToiletJobCount(this.listQuery).then(response => {
-        this.list = response.data
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginDate = this.timeRange[0]
+        this.listQuery.endDate = this.timeRange[1]
+      } else {
+        this.listQuery.beginDate = ''
+        this.listQuery.endDate = ''
+      }
+      getToiletEvaluation(this.listQuery).then(response => {
+        // 降序排序
+        this.list = response.data.sort((a, b) => {
+          return b.avgScore - a.avgScore
+        })
         this.total = response.data.length
         this.listLoading = false
       })
     },
     // 评价记录详情列表
-    showDetail(id,name) {
+    showDetail(id, name) {
       const listQuery = {
         beginDate: this.listQuery.beginDate,
         endDate: this.listQuery.endDate,
         toiletId: id
       }
-      this.$refs.evaluationList.initDialog(listQuery,name)
+      this.$refs.evaluationList.initDialog(listQuery, name)
     },
     // 批量导出
     batchExport() {
diff --git a/src/views/statistics/toiletAssessment.vue b/src/views/statistics/toiletAssessment.vue
index 2b8522a..67aa32b 100644
--- a/src/views/statistics/toiletAssessment.vue
+++ b/src/views/statistics/toiletAssessment.vue
@@ -168,8 +168,13 @@
     // 按日统计
     searchByDay() {
       this.listQuery.type = 'day'
-      this.listQuery.startTime = this.timeRange[0]
-      this.listQuery.endTime = this.timeRange[1]
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.startTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
       this.fetchData()
       // this.listLoading = true
       // this.list = [
diff --git a/src/views/toiletClean/toiletCleanList.vue b/src/views/toiletClean/toiletCleanList.vue
index 1e4af18..9dfc046 100644
--- a/src/views/toiletClean/toiletCleanList.vue
+++ b/src/views/toiletClean/toiletCleanList.vue
@@ -42,11 +42,13 @@
 
 <script>
 import { getToiletJobRecords, batchExportToiletJobRecords } from '@/api/sanitation/toilet'
+import { getToday, getLastWeek } from '@/utils/dateutils'
+
 export default {
   name: 'ToiletCleanList',
   data() {
     return {
-      dateRange: [], // 日期范围
+      dateRange: [getLastWeek('yyyy-MM-dd'), getToday('yyyy-MM-dd')], // 日期范围
       listQuery: {
         name: '', // 作业人
         jobContent: '', // 作业内容
@@ -124,7 +126,7 @@
       // ]
       // this.total = this.list.length
       // this.listLoading = false
-      if (this.dateRange.length > 0) {
+      if (this.dateRange && this.dateRange.length > 0) {
         this.listQuery.startTime = this.dateRange[0]
         this.listQuery.endTime = this.dateRange[1]
       } else {
diff --git a/src/views/toiletManage/toiletList.vue b/src/views/toiletManage/toiletList.vue
index 92997a0..f3a81b2 100644
--- a/src/views/toiletManage/toiletList.vue
+++ b/src/views/toiletManage/toiletList.vue
@@ -15,10 +15,10 @@
     </search-area>
     <normal-table :data="list" :head="tableOption.head" :query="listQuery" :total="total" :columns="columns" :list-loading="listLoading" :options="tableOption.options" :tools-option="tableOption.toolsOption" @change="changePage">
       <template slot="btns">
-        <el-button v-if="hasPerm('/sanitation/toilet/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
+        <el-button v-if="hasPerm('/toilet/toilet/add')" size="small" class="edit_btn" @click.stop="add">新增</el-button>
         <!--<el-button size="small" class="edit_btn">删除</el-button>-->
         <el-upload
-          v-if="hasPerm('/sanitation/toilet/import')"
+          v-if="hasPerm('/toilet/toilet/import')"
           :limit="1"
           :show-file-list="false"
           :http-request="uploadFile"
@@ -28,14 +28,14 @@
           class="edit_btn">
           <el-button slot="trigger" size="small">批量导入</el-button>
         </el-upload>
-        <el-button v-if="hasPerm('/sanitation/toilet/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
+        <el-button v-if="hasPerm('/toilet/toilet/export')" size="small" class="edit_btn" @click="batchExport">批量导出</el-button>
       </template>
       <template slot="columns">
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.stop="goDetail(scope.row)">详情</el-button>
-            <el-button v-if="hasPerm('/sanitation/toilet/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
-            <el-button v-if="hasPerm('/sanitation/toilet/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
+            <el-button v-if="hasPerm('/toilet/toilet/update')" type="text" size="small" @click.stop="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/toilet/toilet/delete')" type="text" size="small" @click.stop="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </template>