diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index a0decda..2cf351a 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -1,6 +1,6 @@
 <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-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :options="{zoomControl: false}" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
       <l-tile-layer :url="mapurl"/>
       <l-tile-layer :url="labelurl"/>
       <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
@@ -63,7 +63,7 @@
       this.map.on('click', function(e) {
         that.$emit('click', e)
       })
-      this.$emit('ready')
+      this.$emit('ready', this.map)
     }
   }
 }

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index a0decda..2cf351a 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -1,6 +1,6 @@
 <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-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :options="{zoomControl: false}" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
       <l-tile-layer :url="mapurl"/>
       <l-tile-layer :url="labelurl"/>
       <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
@@ -63,7 +63,7 @@
       this.map.on('click', function(e) {
         that.$emit('click', e)
       })
-      this.$emit('ready')
+      this.$emit('ready', this.map)
     }
   }
 }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index a0decda..2cf351a 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -1,6 +1,6 @@
 <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-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :options="{zoomControl: false}" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
       <l-tile-layer :url="mapurl"/>
       <l-tile-layer :url="labelurl"/>
       <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
@@ -63,7 +63,7 @@
       this.map.on('click', function(e) {
         that.$emit('click', e)
       })
-      this.$emit('ready')
+      this.$emit('ready', this.map)
     }
   }
 }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index a0decda..2cf351a 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -1,6 +1,6 @@
 <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-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :options="{zoomControl: false}" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
       <l-tile-layer :url="mapurl"/>
       <l-tile-layer :url="labelurl"/>
       <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
@@ -63,7 +63,7 @@
       this.map.on('click', function(e) {
         that.$emit('click', e)
       })
-      this.$emit('ready')
+      this.$emit('ready', this.map)
     }
   }
 }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index a0decda..2cf351a 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -1,6 +1,6 @@
 <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-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :options="{zoomControl: false}" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
       <l-tile-layer :url="mapurl"/>
       <l-tile-layer :url="labelurl"/>
       <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
@@ -63,7 +63,7 @@
       this.map.on('click', function(e) {
         that.$emit('click', e)
       })
-      this.$emit('ready')
+      this.$emit('ready', this.map)
     }
   }
 }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {
diff --git a/src/views/overview/components/drawTool.vue b/src/views/overview/components/drawTool.vue
new file mode 100644
index 0000000..8c0f98f
--- /dev/null
+++ b/src/views/overview/components/drawTool.vue
@@ -0,0 +1,72 @@
+<!--
+ * @Description: 图形框选工具
+ * @Author: 王晓颖
+ * @Date: 2021-03-10 09:50:44
+ -->
+<template>
+  <div class="draw-card">
+    <el-button title="绘制矩形选框" class="icon-btn" @click="draw('Rectangle')">
+      <img src="@/assets/overview/square.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制圆形选框" class="icon-btn" @click="draw('Circle')">
+      <img src="@/assets/overview/circle.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制多边形选框" class="icon-btn" @click="draw('Polygon')">
+      <img src="@/assets/overview/polygon.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button v-show="clearShow" title="清除选区" class="icon-btn" @click="clear">
+      <img src="@/assets/overview/delete.png" style="height: 18px;width: 18px;">
+    </el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DrawTool',
+  props: {
+    squareShow: {
+      type: Boolean,
+      default: true
+    }, // 矩形框选工具是否开启
+    polygonShow: {
+      type: Boolean,
+      default: true
+    } // 多边形框选工具是否开启
+  },
+  data() {
+    return {
+      clearShow: false
+    }
+  },
+  methods: {
+    // 点击框选
+    draw(type) {
+      this.$notify({
+        title: '框选工具开启',
+        message: '您可以开始框选区域'
+      })
+      this.$emit('click', type)
+      this.clearShow = true
+    },
+    // 清除
+    clear() {
+      this.$emit('clear')
+      this.clearShow = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.draw-card{
+  margin: 0px 0px;
+  .icon-btn{
+    height: 40px;
+    width: 40px;
+    padding: 0px;
+    -moz-box-shadow: 0px 1px 3px #d9d9d9; /* 老的 Firefox */
+    box-shadow: 0px 1px 3px #d9d9d9;
+  }
+}
+
+</style>

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index a0decda..2cf351a 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -1,6 +1,6 @@
 <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-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :options="{zoomControl: false}" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
       <l-tile-layer :url="mapurl"/>
       <l-tile-layer :url="labelurl"/>
       <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
@@ -63,7 +63,7 @@
       this.map.on('click', function(e) {
         that.$emit('click', e)
       })
-      this.$emit('ready')
+      this.$emit('ready', this.map)
     }
   }
 }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {
diff --git a/src/views/overview/components/drawTool.vue b/src/views/overview/components/drawTool.vue
new file mode 100644
index 0000000..8c0f98f
--- /dev/null
+++ b/src/views/overview/components/drawTool.vue
@@ -0,0 +1,72 @@
+<!--
+ * @Description: 图形框选工具
+ * @Author: 王晓颖
+ * @Date: 2021-03-10 09:50:44
+ -->
+<template>
+  <div class="draw-card">
+    <el-button title="绘制矩形选框" class="icon-btn" @click="draw('Rectangle')">
+      <img src="@/assets/overview/square.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制圆形选框" class="icon-btn" @click="draw('Circle')">
+      <img src="@/assets/overview/circle.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制多边形选框" class="icon-btn" @click="draw('Polygon')">
+      <img src="@/assets/overview/polygon.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button v-show="clearShow" title="清除选区" class="icon-btn" @click="clear">
+      <img src="@/assets/overview/delete.png" style="height: 18px;width: 18px;">
+    </el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DrawTool',
+  props: {
+    squareShow: {
+      type: Boolean,
+      default: true
+    }, // 矩形框选工具是否开启
+    polygonShow: {
+      type: Boolean,
+      default: true
+    } // 多边形框选工具是否开启
+  },
+  data() {
+    return {
+      clearShow: false
+    }
+  },
+  methods: {
+    // 点击框选
+    draw(type) {
+      this.$notify({
+        title: '框选工具开启',
+        message: '您可以开始框选区域'
+      })
+      this.$emit('click', type)
+      this.clearShow = true
+    },
+    // 清除
+    clear() {
+      this.$emit('clear')
+      this.clearShow = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.draw-card{
+  margin: 0px 0px;
+  .icon-btn{
+    height: 40px;
+    width: 40px;
+    padding: 0px;
+    -moz-box-shadow: 0px 1px 3px #d9d9d9; /* 老的 Firefox */
+    box-shadow: 0px 1px 3px #d9d9d9;
+  }
+}
+
+</style>
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 8c615c4..da7f5ee 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -5,51 +5,26 @@
  -->
 <template>
   <div class="info-window">
-    <!--人员详情-->
-    <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'&&data!=null" class="info-body">
-      <div>姓名：{{ data.name }}</div>
-      <div>性别：{{ data.sexName }}</div>
-      <div>联系电话：{{ data.tel }}</div>
-      <div>人员类别：{{ data.postName }}</div>
-      <div>负责片区：{{ data.responseArea }}</div>
-    </div>
-    <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'&&data!=null" class="info-body">
-      <div>公厕编号：{{ data.code }}</div>
-      <div>公厕名称：{{ data.name }}</div>
-      <div>位置：{{ data.position }}</div>
-      <div>建设单位：{{ data.owner }}</div>
-      <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>占地面积：{{ data.area }}平方米</div>
-      <div>建设时间：{{ data.ts }}</div>
-    </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
     <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
+      <div>垃圾桶类别：{{ data.typeName }}</div>
       <div>位置：{{ data.position }}</div>
+      <div>收集单位：{{ data.collectCompany }}</div>
+      <div>收集车辆：{{ data.collectCar }}</div>
+      <div>收集频率：{{ data.collectFrequency }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>启用时间：{{ data.ts }}</div>
     </div>
-    <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'&&data!=null" class="info-body">
-      <div>中转站编号：{{ data.code }}</div>
-      <div>中转站名称：{{ data.name }}</div>
+    <div v-if="type=='classification'" class="info-header">分类箱详情</div>
+    <div v-if="type=='classification'&&data!=null" class="info-body">
+      <div>分类箱编号：{{ data.code }}</div>
+      <div>分类箱名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
-      <div>建设单位：{{ data.owner }}</div>
+      <div>收集单位：{{ data.collectCompany }}</div>
+      <div>收集车辆：{{ data.collectCar }}</div>
+      <div>收集频率：{{ data.collectFrequency }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>占地面积：{{ data.area }}平方米</div>
-      <!--<div>最新垃圾量：{{ data.capacity }}立方米</div>-->
-      <div>建设时间：{{ data.ts }}</div>
-    </div>
-    <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'&&data!=null" class="info-body">
-      <div>车牌号：{{ data.carCode }}</div>
-      <div>车辆描述：{{ data.description }}</div>
-      <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>使用单位：{{ data.deptName }} </div>
-      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index a0decda..2cf351a 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -1,6 +1,6 @@
 <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-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :options="{zoomControl: false}" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
       <l-tile-layer :url="mapurl"/>
       <l-tile-layer :url="labelurl"/>
       <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
@@ -63,7 +63,7 @@
       this.map.on('click', function(e) {
         that.$emit('click', e)
       })
-      this.$emit('ready')
+      this.$emit('ready', this.map)
     }
   }
 }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {
diff --git a/src/views/overview/components/drawTool.vue b/src/views/overview/components/drawTool.vue
new file mode 100644
index 0000000..8c0f98f
--- /dev/null
+++ b/src/views/overview/components/drawTool.vue
@@ -0,0 +1,72 @@
+<!--
+ * @Description: 图形框选工具
+ * @Author: 王晓颖
+ * @Date: 2021-03-10 09:50:44
+ -->
+<template>
+  <div class="draw-card">
+    <el-button title="绘制矩形选框" class="icon-btn" @click="draw('Rectangle')">
+      <img src="@/assets/overview/square.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制圆形选框" class="icon-btn" @click="draw('Circle')">
+      <img src="@/assets/overview/circle.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制多边形选框" class="icon-btn" @click="draw('Polygon')">
+      <img src="@/assets/overview/polygon.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button v-show="clearShow" title="清除选区" class="icon-btn" @click="clear">
+      <img src="@/assets/overview/delete.png" style="height: 18px;width: 18px;">
+    </el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DrawTool',
+  props: {
+    squareShow: {
+      type: Boolean,
+      default: true
+    }, // 矩形框选工具是否开启
+    polygonShow: {
+      type: Boolean,
+      default: true
+    } // 多边形框选工具是否开启
+  },
+  data() {
+    return {
+      clearShow: false
+    }
+  },
+  methods: {
+    // 点击框选
+    draw(type) {
+      this.$notify({
+        title: '框选工具开启',
+        message: '您可以开始框选区域'
+      })
+      this.$emit('click', type)
+      this.clearShow = true
+    },
+    // 清除
+    clear() {
+      this.$emit('clear')
+      this.clearShow = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.draw-card{
+  margin: 0px 0px;
+  .icon-btn{
+    height: 40px;
+    width: 40px;
+    padding: 0px;
+    -moz-box-shadow: 0px 1px 3px #d9d9d9; /* 老的 Firefox */
+    box-shadow: 0px 1px 3px #d9d9d9;
+  }
+}
+
+</style>
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 8c615c4..da7f5ee 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -5,51 +5,26 @@
  -->
 <template>
   <div class="info-window">
-    <!--人员详情-->
-    <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'&&data!=null" class="info-body">
-      <div>姓名：{{ data.name }}</div>
-      <div>性别：{{ data.sexName }}</div>
-      <div>联系电话：{{ data.tel }}</div>
-      <div>人员类别：{{ data.postName }}</div>
-      <div>负责片区：{{ data.responseArea }}</div>
-    </div>
-    <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'&&data!=null" class="info-body">
-      <div>公厕编号：{{ data.code }}</div>
-      <div>公厕名称：{{ data.name }}</div>
-      <div>位置：{{ data.position }}</div>
-      <div>建设单位：{{ data.owner }}</div>
-      <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>占地面积：{{ data.area }}平方米</div>
-      <div>建设时间：{{ data.ts }}</div>
-    </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
     <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
+      <div>垃圾桶类别：{{ data.typeName }}</div>
       <div>位置：{{ data.position }}</div>
+      <div>收集单位：{{ data.collectCompany }}</div>
+      <div>收集车辆：{{ data.collectCar }}</div>
+      <div>收集频率：{{ data.collectFrequency }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>启用时间：{{ data.ts }}</div>
     </div>
-    <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'&&data!=null" class="info-body">
-      <div>中转站编号：{{ data.code }}</div>
-      <div>中转站名称：{{ data.name }}</div>
+    <div v-if="type=='classification'" class="info-header">分类箱详情</div>
+    <div v-if="type=='classification'&&data!=null" class="info-body">
+      <div>分类箱编号：{{ data.code }}</div>
+      <div>分类箱名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
-      <div>建设单位：{{ data.owner }}</div>
+      <div>收集单位：{{ data.collectCompany }}</div>
+      <div>收集车辆：{{ data.collectCar }}</div>
+      <div>收集频率：{{ data.collectFrequency }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>占地面积：{{ data.area }}平方米</div>
-      <!--<div>最新垃圾量：{{ data.capacity }}立方米</div>-->
-      <div>建设时间：{{ data.ts }}</div>
-    </div>
-    <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'&&data!=null" class="info-body">
-      <div>车牌号：{{ data.carCode }}</div>
-      <div>车辆描述：{{ data.description }}</div>
-      <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>使用单位：{{ data.deptName }} </div>
-      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
diff --git a/src/views/overview/components/toolsContainer.vue b/src/views/overview/components/toolsContainer.vue
new file mode 100644
index 0000000..f1e4478
--- /dev/null
+++ b/src/views/overview/components/toolsContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description: 工具容器
+ * @Author: 王晓颖
+ * @Date: 2021-03-10 09:30:20
+ -->
+<template>
+  <div class="tools-container">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ToolsContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.tools-container{
+  width:auto;
+  position: absolute;
+  right:50px;
+  top:20px;
+  z-index:10000;
+  display: flex;
+  justify-content: end;
+}
+</style>

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index a0decda..2cf351a 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -1,6 +1,6 @@
 <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-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :options="{zoomControl: false}" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
       <l-tile-layer :url="mapurl"/>
       <l-tile-layer :url="labelurl"/>
       <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
@@ -63,7 +63,7 @@
       this.map.on('click', function(e) {
         that.$emit('click', e)
       })
-      this.$emit('ready')
+      this.$emit('ready', this.map)
     }
   }
 }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {
diff --git a/src/views/overview/components/drawTool.vue b/src/views/overview/components/drawTool.vue
new file mode 100644
index 0000000..8c0f98f
--- /dev/null
+++ b/src/views/overview/components/drawTool.vue
@@ -0,0 +1,72 @@
+<!--
+ * @Description: 图形框选工具
+ * @Author: 王晓颖
+ * @Date: 2021-03-10 09:50:44
+ -->
+<template>
+  <div class="draw-card">
+    <el-button title="绘制矩形选框" class="icon-btn" @click="draw('Rectangle')">
+      <img src="@/assets/overview/square.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制圆形选框" class="icon-btn" @click="draw('Circle')">
+      <img src="@/assets/overview/circle.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制多边形选框" class="icon-btn" @click="draw('Polygon')">
+      <img src="@/assets/overview/polygon.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button v-show="clearShow" title="清除选区" class="icon-btn" @click="clear">
+      <img src="@/assets/overview/delete.png" style="height: 18px;width: 18px;">
+    </el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DrawTool',
+  props: {
+    squareShow: {
+      type: Boolean,
+      default: true
+    }, // 矩形框选工具是否开启
+    polygonShow: {
+      type: Boolean,
+      default: true
+    } // 多边形框选工具是否开启
+  },
+  data() {
+    return {
+      clearShow: false
+    }
+  },
+  methods: {
+    // 点击框选
+    draw(type) {
+      this.$notify({
+        title: '框选工具开启',
+        message: '您可以开始框选区域'
+      })
+      this.$emit('click', type)
+      this.clearShow = true
+    },
+    // 清除
+    clear() {
+      this.$emit('clear')
+      this.clearShow = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.draw-card{
+  margin: 0px 0px;
+  .icon-btn{
+    height: 40px;
+    width: 40px;
+    padding: 0px;
+    -moz-box-shadow: 0px 1px 3px #d9d9d9; /* 老的 Firefox */
+    box-shadow: 0px 1px 3px #d9d9d9;
+  }
+}
+
+</style>
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 8c615c4..da7f5ee 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -5,51 +5,26 @@
  -->
 <template>
   <div class="info-window">
-    <!--人员详情-->
-    <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'&&data!=null" class="info-body">
-      <div>姓名：{{ data.name }}</div>
-      <div>性别：{{ data.sexName }}</div>
-      <div>联系电话：{{ data.tel }}</div>
-      <div>人员类别：{{ data.postName }}</div>
-      <div>负责片区：{{ data.responseArea }}</div>
-    </div>
-    <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'&&data!=null" class="info-body">
-      <div>公厕编号：{{ data.code }}</div>
-      <div>公厕名称：{{ data.name }}</div>
-      <div>位置：{{ data.position }}</div>
-      <div>建设单位：{{ data.owner }}</div>
-      <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>占地面积：{{ data.area }}平方米</div>
-      <div>建设时间：{{ data.ts }}</div>
-    </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
     <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
+      <div>垃圾桶类别：{{ data.typeName }}</div>
       <div>位置：{{ data.position }}</div>
+      <div>收集单位：{{ data.collectCompany }}</div>
+      <div>收集车辆：{{ data.collectCar }}</div>
+      <div>收集频率：{{ data.collectFrequency }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>启用时间：{{ data.ts }}</div>
     </div>
-    <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'&&data!=null" class="info-body">
-      <div>中转站编号：{{ data.code }}</div>
-      <div>中转站名称：{{ data.name }}</div>
+    <div v-if="type=='classification'" class="info-header">分类箱详情</div>
+    <div v-if="type=='classification'&&data!=null" class="info-body">
+      <div>分类箱编号：{{ data.code }}</div>
+      <div>分类箱名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
-      <div>建设单位：{{ data.owner }}</div>
+      <div>收集单位：{{ data.collectCompany }}</div>
+      <div>收集车辆：{{ data.collectCar }}</div>
+      <div>收集频率：{{ data.collectFrequency }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>占地面积：{{ data.area }}平方米</div>
-      <!--<div>最新垃圾量：{{ data.capacity }}立方米</div>-->
-      <div>建设时间：{{ data.ts }}</div>
-    </div>
-    <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'&&data!=null" class="info-body">
-      <div>车牌号：{{ data.carCode }}</div>
-      <div>车辆描述：{{ data.description }}</div>
-      <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>使用单位：{{ data.deptName }} </div>
-      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
diff --git a/src/views/overview/components/toolsContainer.vue b/src/views/overview/components/toolsContainer.vue
new file mode 100644
index 0000000..f1e4478
--- /dev/null
+++ b/src/views/overview/components/toolsContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description: 工具容器
+ * @Author: 王晓颖
+ * @Date: 2021-03-10 09:30:20
+ -->
+<template>
+  <div class="tools-container">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ToolsContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.tools-container{
+  width:auto;
+  position: absolute;
+  right:50px;
+  top:20px;
+  z-index:10000;
+  display: flex;
+  justify-content: end;
+}
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 4ca39b2..41c4793 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -9,33 +9,42 @@
     <div class="top-board">
       <div class="board-div">
         <div class="board-div-value">
-          3
+          {{ wastebinCount }}
         </div>
         <div class="board-div-title">
           垃圾桶
         </div>
       </div>
-      <el-divider direction="vertical"></el-divider>
+      <el-divider direction="vertical"/>
       <div class="board-div">
         <div class="board-div-value">
-          0
+          {{ classificationCount }}
         </div>
         <div class="board-div-title">
           分类箱
         </div>
       </div>
-    </div>
-    <map-view>
-      <!--人员显示-->
-      <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="openPopup($event,'staff',staff)">
-          <l-popup>
-            <popwindow :data="currentData" type="staff"/>
-          </l-popup>
-        </l-marker>
+      <div v-show="area!==''">
+        <el-divider direction="vertical"/>
       </div>
+      <div v-show="area" class="board-div">
+        <div class="board-div-value">
+          {{ area }} km²
+        </div>
+        <div class="board-div-title">
+          面积
+        </div>
+      </div>
+    </div>
+    <!--工具箱-->
+    <tools-container>
+      <!-- 绘制工具-->
+      <draw-tool @click="drawBox" @clear="clearDraw"/>
+    </tools-container>
+    <!--地图-->
+    <map-view @ready="mapInit">
       <!--设施显示-->
-      <div v-if="type=='device'">
+      <div>
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng" @click="openPopup($event,'wastebin',wastebin)">
             <l-popup @ready="fetchWastebinDetail">
@@ -43,10 +52,10 @@
             </l-popup>
           </l-marker>
         </div>
-        <div v-if="transferStationShow">
-          <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng" @click="openPopup($event,'transferStation',transferStation)">
-            <l-popup @ready="fetchTransferStationDetail">
-              <popwindow :data="currentData" type="transferStation"/>
+        <div v-if="classificationShow">
+          <l-marker v-for="(classification,index) in classifications" :key="'classification'+index" :icon="classificationIcon" :lat-lng="classification.latlng" @click="openPopup($event,'classification',classification)">
+            <l-popup @ready="fetchClassificationDetail">
+              <popwindow :data="currentData" type="classification"/>
             </l-popup>
           </l-marker>
         </div>
@@ -60,53 +69,50 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './components/popwindow'
-import { getWastebinListPage } from '@/api/biz/wastebin'
-
+import { getWastebinList } from '@/api/biz/wastebin'
+import ToolsContainer from './components/toolsContainer'
+import DrawTool from './components/drawTool'
+import 'leaflet.pm'
+import 'leaflet.pm/dist/leaflet.pm.css'
+import * as turf from '@turf/turf'
 export default {
   name: 'MapOverview',
-  components: { Popwindow, MapView, LMarker, LIcon, LPopup },
+  components: { DrawTool, ToolsContainer, Popwindow, MapView, LMarker, LIcon, LPopup },
   data() {
     return {
-      type: 'device', // 地图显示类型: staff人员， device设施， car 车辆
-      staffs: [], // 人员列表
+      map: null, // 地图
+      drawLayer: null, // 绘制图层
       wastebins: [], // 垃圾桶列表
-      transferStations: [], // 垃圾中转站列表
-      toilets: [], // 公厕
-      cars: [], // 车辆
-      staffIcon: L.icon({
-        iconUrl: require('@/assets/overview/staff-yellow.png'),
-        iconSize: [32, 32],
-        iconAnchor: [16, 32]
-      }), // 人员图标
-      toiletIcon: L.icon({
-        iconUrl: require('@/assets/overview/toilet.png'),
-        iconSize: [32, 32],
-        iconAnchor: [16, 32]
-      }), // 公厕图标
+      classifications: [], // 垃圾中转站列表
+      wastebinCount: 0,
+      classificationCount: 0,
       wastebinIcon: L.icon({
         iconUrl: require('@/assets/overview/wastebin.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 垃圾桶图标
-      transferStationIcon: L.icon({
-        iconUrl: require('@/assets/overview/transferstation.png'),
+      classificationIcon: L.icon({
+        iconUrl: require('@/assets/overview/classification.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
-      }), // 转运站图标
-      staffShow: true, // 人员是否显示
+      }), // 分类箱图标
       wastebinShow: true, // 垃圾桶是否显示
-      transferStationShow: true, // 转运站是否显示
-      toiletShow: true, // 公厕是否显示
-      carShow: true, // 车辆是否显示
-      currentData: {} // 当前弹窗数据
+      classificationShow: true, // 分类箱是否显示
+      currentData: {}, // 当前弹窗数据
+      area: '' // 选区面积
     }
   },
   created() {
     this.getWastebins()
   },
   methods: {
+    // 地图初始化完毕
+    mapInit(map) {
+      this.map = map
+      this.map.pm.setLang('zh')
+    },
     // 获取垃圾桶列表
-    getWastebins() {
+    getWastebins: function() {
       // this.wastebins = [
       //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
       //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
@@ -117,22 +123,153 @@
         sort: '',
         order: 'desc'
       }
-      getWastebinListPage(params).then(response => {
+      getWastebinList(params).then(response => {
         if (response.code === 200) {
-          this.wastebins = response.data.rows.map(item => {
+          this.wastebins = response.data.filter(item => item.isClassification === 0)
+          this.wastebins = this.wastebins.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
             }
           })
+          this.wastebinCount = this.wastebins.length
+          this.classifications = response.data.filter(item => item.isClassification === 1)
+          this.classifications = this.classifications.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+          this.classificationCount = this.classifications.length
         }
       })
     },
     // 获取垃圾桶详情
     fetchWastebinDetail(data) {
       this.currentData = data
+    },
+    // 获取分类箱详情
+    fetchClassificationDetail(data) {
+      this.currentData = data
+    },
+    // 打开弹窗
+    async openPopup(event, type, data) {
+      switch (type) {
+        case 'wastebin':
+          await this.fetchWastebinDetail(data)
+          break
+        case 'classification':
+          await this.fetchClassificationDetail(data)
+          break
+      }
+      this.$nextTick(() => {
+        event.target.openPopup()
+      })
+    },
+    // 移除绘制图层
+    drawDelete() {
+      if (this.drawLayer) {
+        this.drawLayer.layer.remove()
+      }
+      if (this.map.graphics) {
+        this.map.graphics.forEach(graphic => {
+          this.map.removeLayer(graphic.layer)
+        })
+      }
+    },
+    // 绘制选框
+    drawBox(type) {
+      console.log(this.map)
+      this.drawDelete()
+      this.$nextTick(() => {
+        this.map.pm.enableDraw(type, {
+          snappable: false
+        })
+        // 绘制完成
+        this.map.on('pm:create', e => {
+          this.drawLayer = e
+          // debugger
+          // 计算面积
+          var area
+          if (e.shape === 'Circle') {
+            // 计算面积
+            const radius = e.layer.options.radius
+            const latlng = e.layer.getLatLng()
+            area = 3.1415926 * radius * radius
+            this.area = (area / 1000000).toFixed(2)
+            const circle = turf.circle([latlng.lng, latlng.lat], radius / 1000)
+            // 依次判断点的存在
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
+          } else {
+            // 获取选区的geojson, 用turf计算面积
+            const geojson = e.layer.toGeoJSON()
+            area = turf.area(geojson)
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
+          }
+          this.area = (area / 1000000).toFixed(2)
+          console.log('面积' + area.toString())
+          // 计算区域内的垃圾桶和分类箱个数
+        })
+      })
+    },
+    judgePointInPolygon(p, geojson) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      // 2. 多边形
+      const polygon = geojson.geometry
+      const result = turf.booleanPointInPolygon(point, polygon)
+      if (result) {
+        console.log('is in polygon')
+      }
+      return result
+    },
+    // 判断点是否在圆里
+    judgePointInCircle(p, circle) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      const result = turf.booleanPointInPolygon(point, circle)
+      if (result) {
+        console.log('is in circle')
+      }
+      return result
+    },
+    // 清除绘制
+    clearDraw() {
+      if (this.drawLayer) {
+        this.drawDelete()
+      } else {
+        this.map.pm.toggleGlobalRemovalMode()
+      }
+      this.area = ''
+      this.wastebinCount = this.wastebins.length
+      this.classificationCount = this.classifications.length
     }
-
   }
 }
 </script>
@@ -144,7 +281,7 @@
   position: relative;
   .top-board{
     height: 100px;
-    width:300px;
+    min-width:250px;
     background-color: #ffffff;
     position: absolute;
     z-index:1001;
@@ -155,7 +292,7 @@
     align-items: center;
     padding:12px;
     .board-div{
-      width: 45%;
+      min-width: 80px;
       font-size:19px;
       text-align: center;
       .board-div-value{

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index a0decda..2cf351a 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -1,6 +1,6 @@
 <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-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :options="{zoomControl: false}" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
       <l-tile-layer :url="mapurl"/>
       <l-tile-layer :url="labelurl"/>
       <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
@@ -63,7 +63,7 @@
       this.map.on('click', function(e) {
         that.$emit('click', e)
       })
-      this.$emit('ready')
+      this.$emit('ready', this.map)
     }
   }
 }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {
diff --git a/src/views/overview/components/drawTool.vue b/src/views/overview/components/drawTool.vue
new file mode 100644
index 0000000..8c0f98f
--- /dev/null
+++ b/src/views/overview/components/drawTool.vue
@@ -0,0 +1,72 @@
+<!--
+ * @Description: 图形框选工具
+ * @Author: 王晓颖
+ * @Date: 2021-03-10 09:50:44
+ -->
+<template>
+  <div class="draw-card">
+    <el-button title="绘制矩形选框" class="icon-btn" @click="draw('Rectangle')">
+      <img src="@/assets/overview/square.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制圆形选框" class="icon-btn" @click="draw('Circle')">
+      <img src="@/assets/overview/circle.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制多边形选框" class="icon-btn" @click="draw('Polygon')">
+      <img src="@/assets/overview/polygon.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button v-show="clearShow" title="清除选区" class="icon-btn" @click="clear">
+      <img src="@/assets/overview/delete.png" style="height: 18px;width: 18px;">
+    </el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DrawTool',
+  props: {
+    squareShow: {
+      type: Boolean,
+      default: true
+    }, // 矩形框选工具是否开启
+    polygonShow: {
+      type: Boolean,
+      default: true
+    } // 多边形框选工具是否开启
+  },
+  data() {
+    return {
+      clearShow: false
+    }
+  },
+  methods: {
+    // 点击框选
+    draw(type) {
+      this.$notify({
+        title: '框选工具开启',
+        message: '您可以开始框选区域'
+      })
+      this.$emit('click', type)
+      this.clearShow = true
+    },
+    // 清除
+    clear() {
+      this.$emit('clear')
+      this.clearShow = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.draw-card{
+  margin: 0px 0px;
+  .icon-btn{
+    height: 40px;
+    width: 40px;
+    padding: 0px;
+    -moz-box-shadow: 0px 1px 3px #d9d9d9; /* 老的 Firefox */
+    box-shadow: 0px 1px 3px #d9d9d9;
+  }
+}
+
+</style>
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 8c615c4..da7f5ee 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -5,51 +5,26 @@
  -->
 <template>
   <div class="info-window">
-    <!--人员详情-->
-    <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'&&data!=null" class="info-body">
-      <div>姓名：{{ data.name }}</div>
-      <div>性别：{{ data.sexName }}</div>
-      <div>联系电话：{{ data.tel }}</div>
-      <div>人员类别：{{ data.postName }}</div>
-      <div>负责片区：{{ data.responseArea }}</div>
-    </div>
-    <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'&&data!=null" class="info-body">
-      <div>公厕编号：{{ data.code }}</div>
-      <div>公厕名称：{{ data.name }}</div>
-      <div>位置：{{ data.position }}</div>
-      <div>建设单位：{{ data.owner }}</div>
-      <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>占地面积：{{ data.area }}平方米</div>
-      <div>建设时间：{{ data.ts }}</div>
-    </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
     <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
+      <div>垃圾桶类别：{{ data.typeName }}</div>
       <div>位置：{{ data.position }}</div>
+      <div>收集单位：{{ data.collectCompany }}</div>
+      <div>收集车辆：{{ data.collectCar }}</div>
+      <div>收集频率：{{ data.collectFrequency }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>启用时间：{{ data.ts }}</div>
     </div>
-    <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'&&data!=null" class="info-body">
-      <div>中转站编号：{{ data.code }}</div>
-      <div>中转站名称：{{ data.name }}</div>
+    <div v-if="type=='classification'" class="info-header">分类箱详情</div>
+    <div v-if="type=='classification'&&data!=null" class="info-body">
+      <div>分类箱编号：{{ data.code }}</div>
+      <div>分类箱名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
-      <div>建设单位：{{ data.owner }}</div>
+      <div>收集单位：{{ data.collectCompany }}</div>
+      <div>收集车辆：{{ data.collectCar }}</div>
+      <div>收集频率：{{ data.collectFrequency }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>占地面积：{{ data.area }}平方米</div>
-      <!--<div>最新垃圾量：{{ data.capacity }}立方米</div>-->
-      <div>建设时间：{{ data.ts }}</div>
-    </div>
-    <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'&&data!=null" class="info-body">
-      <div>车牌号：{{ data.carCode }}</div>
-      <div>车辆描述：{{ data.description }}</div>
-      <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>使用单位：{{ data.deptName }} </div>
-      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
diff --git a/src/views/overview/components/toolsContainer.vue b/src/views/overview/components/toolsContainer.vue
new file mode 100644
index 0000000..f1e4478
--- /dev/null
+++ b/src/views/overview/components/toolsContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description: 工具容器
+ * @Author: 王晓颖
+ * @Date: 2021-03-10 09:30:20
+ -->
+<template>
+  <div class="tools-container">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ToolsContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.tools-container{
+  width:auto;
+  position: absolute;
+  right:50px;
+  top:20px;
+  z-index:10000;
+  display: flex;
+  justify-content: end;
+}
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 4ca39b2..41c4793 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -9,33 +9,42 @@
     <div class="top-board">
       <div class="board-div">
         <div class="board-div-value">
-          3
+          {{ wastebinCount }}
         </div>
         <div class="board-div-title">
           垃圾桶
         </div>
       </div>
-      <el-divider direction="vertical"></el-divider>
+      <el-divider direction="vertical"/>
       <div class="board-div">
         <div class="board-div-value">
-          0
+          {{ classificationCount }}
         </div>
         <div class="board-div-title">
           分类箱
         </div>
       </div>
-    </div>
-    <map-view>
-      <!--人员显示-->
-      <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="openPopup($event,'staff',staff)">
-          <l-popup>
-            <popwindow :data="currentData" type="staff"/>
-          </l-popup>
-        </l-marker>
+      <div v-show="area!==''">
+        <el-divider direction="vertical"/>
       </div>
+      <div v-show="area" class="board-div">
+        <div class="board-div-value">
+          {{ area }} km²
+        </div>
+        <div class="board-div-title">
+          面积
+        </div>
+      </div>
+    </div>
+    <!--工具箱-->
+    <tools-container>
+      <!-- 绘制工具-->
+      <draw-tool @click="drawBox" @clear="clearDraw"/>
+    </tools-container>
+    <!--地图-->
+    <map-view @ready="mapInit">
       <!--设施显示-->
-      <div v-if="type=='device'">
+      <div>
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng" @click="openPopup($event,'wastebin',wastebin)">
             <l-popup @ready="fetchWastebinDetail">
@@ -43,10 +52,10 @@
             </l-popup>
           </l-marker>
         </div>
-        <div v-if="transferStationShow">
-          <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng" @click="openPopup($event,'transferStation',transferStation)">
-            <l-popup @ready="fetchTransferStationDetail">
-              <popwindow :data="currentData" type="transferStation"/>
+        <div v-if="classificationShow">
+          <l-marker v-for="(classification,index) in classifications" :key="'classification'+index" :icon="classificationIcon" :lat-lng="classification.latlng" @click="openPopup($event,'classification',classification)">
+            <l-popup @ready="fetchClassificationDetail">
+              <popwindow :data="currentData" type="classification"/>
             </l-popup>
           </l-marker>
         </div>
@@ -60,53 +69,50 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './components/popwindow'
-import { getWastebinListPage } from '@/api/biz/wastebin'
-
+import { getWastebinList } from '@/api/biz/wastebin'
+import ToolsContainer from './components/toolsContainer'
+import DrawTool from './components/drawTool'
+import 'leaflet.pm'
+import 'leaflet.pm/dist/leaflet.pm.css'
+import * as turf from '@turf/turf'
 export default {
   name: 'MapOverview',
-  components: { Popwindow, MapView, LMarker, LIcon, LPopup },
+  components: { DrawTool, ToolsContainer, Popwindow, MapView, LMarker, LIcon, LPopup },
   data() {
     return {
-      type: 'device', // 地图显示类型: staff人员， device设施， car 车辆
-      staffs: [], // 人员列表
+      map: null, // 地图
+      drawLayer: null, // 绘制图层
       wastebins: [], // 垃圾桶列表
-      transferStations: [], // 垃圾中转站列表
-      toilets: [], // 公厕
-      cars: [], // 车辆
-      staffIcon: L.icon({
-        iconUrl: require('@/assets/overview/staff-yellow.png'),
-        iconSize: [32, 32],
-        iconAnchor: [16, 32]
-      }), // 人员图标
-      toiletIcon: L.icon({
-        iconUrl: require('@/assets/overview/toilet.png'),
-        iconSize: [32, 32],
-        iconAnchor: [16, 32]
-      }), // 公厕图标
+      classifications: [], // 垃圾中转站列表
+      wastebinCount: 0,
+      classificationCount: 0,
       wastebinIcon: L.icon({
         iconUrl: require('@/assets/overview/wastebin.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 垃圾桶图标
-      transferStationIcon: L.icon({
-        iconUrl: require('@/assets/overview/transferstation.png'),
+      classificationIcon: L.icon({
+        iconUrl: require('@/assets/overview/classification.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
-      }), // 转运站图标
-      staffShow: true, // 人员是否显示
+      }), // 分类箱图标
       wastebinShow: true, // 垃圾桶是否显示
-      transferStationShow: true, // 转运站是否显示
-      toiletShow: true, // 公厕是否显示
-      carShow: true, // 车辆是否显示
-      currentData: {} // 当前弹窗数据
+      classificationShow: true, // 分类箱是否显示
+      currentData: {}, // 当前弹窗数据
+      area: '' // 选区面积
     }
   },
   created() {
     this.getWastebins()
   },
   methods: {
+    // 地图初始化完毕
+    mapInit(map) {
+      this.map = map
+      this.map.pm.setLang('zh')
+    },
     // 获取垃圾桶列表
-    getWastebins() {
+    getWastebins: function() {
       // this.wastebins = [
       //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
       //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
@@ -117,22 +123,153 @@
         sort: '',
         order: 'desc'
       }
-      getWastebinListPage(params).then(response => {
+      getWastebinList(params).then(response => {
         if (response.code === 200) {
-          this.wastebins = response.data.rows.map(item => {
+          this.wastebins = response.data.filter(item => item.isClassification === 0)
+          this.wastebins = this.wastebins.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
             }
           })
+          this.wastebinCount = this.wastebins.length
+          this.classifications = response.data.filter(item => item.isClassification === 1)
+          this.classifications = this.classifications.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+          this.classificationCount = this.classifications.length
         }
       })
     },
     // 获取垃圾桶详情
     fetchWastebinDetail(data) {
       this.currentData = data
+    },
+    // 获取分类箱详情
+    fetchClassificationDetail(data) {
+      this.currentData = data
+    },
+    // 打开弹窗
+    async openPopup(event, type, data) {
+      switch (type) {
+        case 'wastebin':
+          await this.fetchWastebinDetail(data)
+          break
+        case 'classification':
+          await this.fetchClassificationDetail(data)
+          break
+      }
+      this.$nextTick(() => {
+        event.target.openPopup()
+      })
+    },
+    // 移除绘制图层
+    drawDelete() {
+      if (this.drawLayer) {
+        this.drawLayer.layer.remove()
+      }
+      if (this.map.graphics) {
+        this.map.graphics.forEach(graphic => {
+          this.map.removeLayer(graphic.layer)
+        })
+      }
+    },
+    // 绘制选框
+    drawBox(type) {
+      console.log(this.map)
+      this.drawDelete()
+      this.$nextTick(() => {
+        this.map.pm.enableDraw(type, {
+          snappable: false
+        })
+        // 绘制完成
+        this.map.on('pm:create', e => {
+          this.drawLayer = e
+          // debugger
+          // 计算面积
+          var area
+          if (e.shape === 'Circle') {
+            // 计算面积
+            const radius = e.layer.options.radius
+            const latlng = e.layer.getLatLng()
+            area = 3.1415926 * radius * radius
+            this.area = (area / 1000000).toFixed(2)
+            const circle = turf.circle([latlng.lng, latlng.lat], radius / 1000)
+            // 依次判断点的存在
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
+          } else {
+            // 获取选区的geojson, 用turf计算面积
+            const geojson = e.layer.toGeoJSON()
+            area = turf.area(geojson)
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
+          }
+          this.area = (area / 1000000).toFixed(2)
+          console.log('面积' + area.toString())
+          // 计算区域内的垃圾桶和分类箱个数
+        })
+      })
+    },
+    judgePointInPolygon(p, geojson) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      // 2. 多边形
+      const polygon = geojson.geometry
+      const result = turf.booleanPointInPolygon(point, polygon)
+      if (result) {
+        console.log('is in polygon')
+      }
+      return result
+    },
+    // 判断点是否在圆里
+    judgePointInCircle(p, circle) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      const result = turf.booleanPointInPolygon(point, circle)
+      if (result) {
+        console.log('is in circle')
+      }
+      return result
+    },
+    // 清除绘制
+    clearDraw() {
+      if (this.drawLayer) {
+        this.drawDelete()
+      } else {
+        this.map.pm.toggleGlobalRemovalMode()
+      }
+      this.area = ''
+      this.wastebinCount = this.wastebins.length
+      this.classificationCount = this.classifications.length
     }
-
   }
 }
 </script>
@@ -144,7 +281,7 @@
   position: relative;
   .top-board{
     height: 100px;
-    width:300px;
+    min-width:250px;
     background-color: #ffffff;
     position: absolute;
     z-index:1001;
@@ -155,7 +292,7 @@
     align-items: center;
     padding:12px;
     .board-div{
-      width: 45%;
+      min-width: 80px;
       font-size:19px;
       text-align: center;
       .board-div-value{
diff --git a/src/views/wastebinClassificationManage/editWastebinC.vue b/src/views/wastebinClassificationManage/editWastebinC.vue
index 3bd263a..42bb247 100644
--- a/src/views/wastebinClassificationManage/editWastebinC.vue
+++ b/src/views/wastebinClassificationManage/editWastebinC.vue
@@ -48,7 +48,7 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="小区/路段" prop="road">
-                <el-input v-model.trim="wastebinForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+                <el-input v-model.trim="wastebinForm.road" :disabled="isDetailMode" type="text" placeholder=""/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -172,7 +172,7 @@
         position: '', // 位置：社区/道路
         lng: '', // 经度
         lat: '', // 纬度
-        isClassification: '0', // 是否分类箱
+        isClassification: '1', // 是否分类箱
         servicePeople: '', // 服务人口
         collectCompany: '', // 收集单位
         collectCar: '', // 收集车辆
@@ -290,7 +290,7 @@
         position: '', // 位置：社区/道路
         lng: '', // 经度
         lat: '', // 纬度
-        isClassification: '0', // 是否分类箱
+        isClassification: '1', // 是否分类箱
         servicePeople: '', // 服务人口
         collectCompany: '', // 收集单位
         collectCar: '', // 收集车辆
@@ -366,6 +366,8 @@
           }).catch((e) => {
             this.canEdit = true
           })
+        }else{
+          this.canEdit = true
         }
       })
     },

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index a0decda..2cf351a 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -1,6 +1,6 @@
 <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-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :options="{zoomControl: false}" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
       <l-tile-layer :url="mapurl"/>
       <l-tile-layer :url="labelurl"/>
       <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
@@ -63,7 +63,7 @@
       this.map.on('click', function(e) {
         that.$emit('click', e)
       })
-      this.$emit('ready')
+      this.$emit('ready', this.map)
     }
   }
 }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {
diff --git a/src/views/overview/components/drawTool.vue b/src/views/overview/components/drawTool.vue
new file mode 100644
index 0000000..8c0f98f
--- /dev/null
+++ b/src/views/overview/components/drawTool.vue
@@ -0,0 +1,72 @@
+<!--
+ * @Description: 图形框选工具
+ * @Author: 王晓颖
+ * @Date: 2021-03-10 09:50:44
+ -->
+<template>
+  <div class="draw-card">
+    <el-button title="绘制矩形选框" class="icon-btn" @click="draw('Rectangle')">
+      <img src="@/assets/overview/square.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制圆形选框" class="icon-btn" @click="draw('Circle')">
+      <img src="@/assets/overview/circle.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制多边形选框" class="icon-btn" @click="draw('Polygon')">
+      <img src="@/assets/overview/polygon.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button v-show="clearShow" title="清除选区" class="icon-btn" @click="clear">
+      <img src="@/assets/overview/delete.png" style="height: 18px;width: 18px;">
+    </el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DrawTool',
+  props: {
+    squareShow: {
+      type: Boolean,
+      default: true
+    }, // 矩形框选工具是否开启
+    polygonShow: {
+      type: Boolean,
+      default: true
+    } // 多边形框选工具是否开启
+  },
+  data() {
+    return {
+      clearShow: false
+    }
+  },
+  methods: {
+    // 点击框选
+    draw(type) {
+      this.$notify({
+        title: '框选工具开启',
+        message: '您可以开始框选区域'
+      })
+      this.$emit('click', type)
+      this.clearShow = true
+    },
+    // 清除
+    clear() {
+      this.$emit('clear')
+      this.clearShow = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.draw-card{
+  margin: 0px 0px;
+  .icon-btn{
+    height: 40px;
+    width: 40px;
+    padding: 0px;
+    -moz-box-shadow: 0px 1px 3px #d9d9d9; /* 老的 Firefox */
+    box-shadow: 0px 1px 3px #d9d9d9;
+  }
+}
+
+</style>
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 8c615c4..da7f5ee 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -5,51 +5,26 @@
  -->
 <template>
   <div class="info-window">
-    <!--人员详情-->
-    <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'&&data!=null" class="info-body">
-      <div>姓名：{{ data.name }}</div>
-      <div>性别：{{ data.sexName }}</div>
-      <div>联系电话：{{ data.tel }}</div>
-      <div>人员类别：{{ data.postName }}</div>
-      <div>负责片区：{{ data.responseArea }}</div>
-    </div>
-    <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'&&data!=null" class="info-body">
-      <div>公厕编号：{{ data.code }}</div>
-      <div>公厕名称：{{ data.name }}</div>
-      <div>位置：{{ data.position }}</div>
-      <div>建设单位：{{ data.owner }}</div>
-      <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>占地面积：{{ data.area }}平方米</div>
-      <div>建设时间：{{ data.ts }}</div>
-    </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
     <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
+      <div>垃圾桶类别：{{ data.typeName }}</div>
       <div>位置：{{ data.position }}</div>
+      <div>收集单位：{{ data.collectCompany }}</div>
+      <div>收集车辆：{{ data.collectCar }}</div>
+      <div>收集频率：{{ data.collectFrequency }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>启用时间：{{ data.ts }}</div>
     </div>
-    <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'&&data!=null" class="info-body">
-      <div>中转站编号：{{ data.code }}</div>
-      <div>中转站名称：{{ data.name }}</div>
+    <div v-if="type=='classification'" class="info-header">分类箱详情</div>
+    <div v-if="type=='classification'&&data!=null" class="info-body">
+      <div>分类箱编号：{{ data.code }}</div>
+      <div>分类箱名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
-      <div>建设单位：{{ data.owner }}</div>
+      <div>收集单位：{{ data.collectCompany }}</div>
+      <div>收集车辆：{{ data.collectCar }}</div>
+      <div>收集频率：{{ data.collectFrequency }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>占地面积：{{ data.area }}平方米</div>
-      <!--<div>最新垃圾量：{{ data.capacity }}立方米</div>-->
-      <div>建设时间：{{ data.ts }}</div>
-    </div>
-    <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'&&data!=null" class="info-body">
-      <div>车牌号：{{ data.carCode }}</div>
-      <div>车辆描述：{{ data.description }}</div>
-      <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>使用单位：{{ data.deptName }} </div>
-      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
diff --git a/src/views/overview/components/toolsContainer.vue b/src/views/overview/components/toolsContainer.vue
new file mode 100644
index 0000000..f1e4478
--- /dev/null
+++ b/src/views/overview/components/toolsContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description: 工具容器
+ * @Author: 王晓颖
+ * @Date: 2021-03-10 09:30:20
+ -->
+<template>
+  <div class="tools-container">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ToolsContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.tools-container{
+  width:auto;
+  position: absolute;
+  right:50px;
+  top:20px;
+  z-index:10000;
+  display: flex;
+  justify-content: end;
+}
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 4ca39b2..41c4793 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -9,33 +9,42 @@
     <div class="top-board">
       <div class="board-div">
         <div class="board-div-value">
-          3
+          {{ wastebinCount }}
         </div>
         <div class="board-div-title">
           垃圾桶
         </div>
       </div>
-      <el-divider direction="vertical"></el-divider>
+      <el-divider direction="vertical"/>
       <div class="board-div">
         <div class="board-div-value">
-          0
+          {{ classificationCount }}
         </div>
         <div class="board-div-title">
           分类箱
         </div>
       </div>
-    </div>
-    <map-view>
-      <!--人员显示-->
-      <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="openPopup($event,'staff',staff)">
-          <l-popup>
-            <popwindow :data="currentData" type="staff"/>
-          </l-popup>
-        </l-marker>
+      <div v-show="area!==''">
+        <el-divider direction="vertical"/>
       </div>
+      <div v-show="area" class="board-div">
+        <div class="board-div-value">
+          {{ area }} km²
+        </div>
+        <div class="board-div-title">
+          面积
+        </div>
+      </div>
+    </div>
+    <!--工具箱-->
+    <tools-container>
+      <!-- 绘制工具-->
+      <draw-tool @click="drawBox" @clear="clearDraw"/>
+    </tools-container>
+    <!--地图-->
+    <map-view @ready="mapInit">
       <!--设施显示-->
-      <div v-if="type=='device'">
+      <div>
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng" @click="openPopup($event,'wastebin',wastebin)">
             <l-popup @ready="fetchWastebinDetail">
@@ -43,10 +52,10 @@
             </l-popup>
           </l-marker>
         </div>
-        <div v-if="transferStationShow">
-          <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng" @click="openPopup($event,'transferStation',transferStation)">
-            <l-popup @ready="fetchTransferStationDetail">
-              <popwindow :data="currentData" type="transferStation"/>
+        <div v-if="classificationShow">
+          <l-marker v-for="(classification,index) in classifications" :key="'classification'+index" :icon="classificationIcon" :lat-lng="classification.latlng" @click="openPopup($event,'classification',classification)">
+            <l-popup @ready="fetchClassificationDetail">
+              <popwindow :data="currentData" type="classification"/>
             </l-popup>
           </l-marker>
         </div>
@@ -60,53 +69,50 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './components/popwindow'
-import { getWastebinListPage } from '@/api/biz/wastebin'
-
+import { getWastebinList } from '@/api/biz/wastebin'
+import ToolsContainer from './components/toolsContainer'
+import DrawTool from './components/drawTool'
+import 'leaflet.pm'
+import 'leaflet.pm/dist/leaflet.pm.css'
+import * as turf from '@turf/turf'
 export default {
   name: 'MapOverview',
-  components: { Popwindow, MapView, LMarker, LIcon, LPopup },
+  components: { DrawTool, ToolsContainer, Popwindow, MapView, LMarker, LIcon, LPopup },
   data() {
     return {
-      type: 'device', // 地图显示类型: staff人员， device设施， car 车辆
-      staffs: [], // 人员列表
+      map: null, // 地图
+      drawLayer: null, // 绘制图层
       wastebins: [], // 垃圾桶列表
-      transferStations: [], // 垃圾中转站列表
-      toilets: [], // 公厕
-      cars: [], // 车辆
-      staffIcon: L.icon({
-        iconUrl: require('@/assets/overview/staff-yellow.png'),
-        iconSize: [32, 32],
-        iconAnchor: [16, 32]
-      }), // 人员图标
-      toiletIcon: L.icon({
-        iconUrl: require('@/assets/overview/toilet.png'),
-        iconSize: [32, 32],
-        iconAnchor: [16, 32]
-      }), // 公厕图标
+      classifications: [], // 垃圾中转站列表
+      wastebinCount: 0,
+      classificationCount: 0,
       wastebinIcon: L.icon({
         iconUrl: require('@/assets/overview/wastebin.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 垃圾桶图标
-      transferStationIcon: L.icon({
-        iconUrl: require('@/assets/overview/transferstation.png'),
+      classificationIcon: L.icon({
+        iconUrl: require('@/assets/overview/classification.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
-      }), // 转运站图标
-      staffShow: true, // 人员是否显示
+      }), // 分类箱图标
       wastebinShow: true, // 垃圾桶是否显示
-      transferStationShow: true, // 转运站是否显示
-      toiletShow: true, // 公厕是否显示
-      carShow: true, // 车辆是否显示
-      currentData: {} // 当前弹窗数据
+      classificationShow: true, // 分类箱是否显示
+      currentData: {}, // 当前弹窗数据
+      area: '' // 选区面积
     }
   },
   created() {
     this.getWastebins()
   },
   methods: {
+    // 地图初始化完毕
+    mapInit(map) {
+      this.map = map
+      this.map.pm.setLang('zh')
+    },
     // 获取垃圾桶列表
-    getWastebins() {
+    getWastebins: function() {
       // this.wastebins = [
       //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
       //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
@@ -117,22 +123,153 @@
         sort: '',
         order: 'desc'
       }
-      getWastebinListPage(params).then(response => {
+      getWastebinList(params).then(response => {
         if (response.code === 200) {
-          this.wastebins = response.data.rows.map(item => {
+          this.wastebins = response.data.filter(item => item.isClassification === 0)
+          this.wastebins = this.wastebins.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
             }
           })
+          this.wastebinCount = this.wastebins.length
+          this.classifications = response.data.filter(item => item.isClassification === 1)
+          this.classifications = this.classifications.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+          this.classificationCount = this.classifications.length
         }
       })
     },
     // 获取垃圾桶详情
     fetchWastebinDetail(data) {
       this.currentData = data
+    },
+    // 获取分类箱详情
+    fetchClassificationDetail(data) {
+      this.currentData = data
+    },
+    // 打开弹窗
+    async openPopup(event, type, data) {
+      switch (type) {
+        case 'wastebin':
+          await this.fetchWastebinDetail(data)
+          break
+        case 'classification':
+          await this.fetchClassificationDetail(data)
+          break
+      }
+      this.$nextTick(() => {
+        event.target.openPopup()
+      })
+    },
+    // 移除绘制图层
+    drawDelete() {
+      if (this.drawLayer) {
+        this.drawLayer.layer.remove()
+      }
+      if (this.map.graphics) {
+        this.map.graphics.forEach(graphic => {
+          this.map.removeLayer(graphic.layer)
+        })
+      }
+    },
+    // 绘制选框
+    drawBox(type) {
+      console.log(this.map)
+      this.drawDelete()
+      this.$nextTick(() => {
+        this.map.pm.enableDraw(type, {
+          snappable: false
+        })
+        // 绘制完成
+        this.map.on('pm:create', e => {
+          this.drawLayer = e
+          // debugger
+          // 计算面积
+          var area
+          if (e.shape === 'Circle') {
+            // 计算面积
+            const radius = e.layer.options.radius
+            const latlng = e.layer.getLatLng()
+            area = 3.1415926 * radius * radius
+            this.area = (area / 1000000).toFixed(2)
+            const circle = turf.circle([latlng.lng, latlng.lat], radius / 1000)
+            // 依次判断点的存在
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
+          } else {
+            // 获取选区的geojson, 用turf计算面积
+            const geojson = e.layer.toGeoJSON()
+            area = turf.area(geojson)
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
+          }
+          this.area = (area / 1000000).toFixed(2)
+          console.log('面积' + area.toString())
+          // 计算区域内的垃圾桶和分类箱个数
+        })
+      })
+    },
+    judgePointInPolygon(p, geojson) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      // 2. 多边形
+      const polygon = geojson.geometry
+      const result = turf.booleanPointInPolygon(point, polygon)
+      if (result) {
+        console.log('is in polygon')
+      }
+      return result
+    },
+    // 判断点是否在圆里
+    judgePointInCircle(p, circle) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      const result = turf.booleanPointInPolygon(point, circle)
+      if (result) {
+        console.log('is in circle')
+      }
+      return result
+    },
+    // 清除绘制
+    clearDraw() {
+      if (this.drawLayer) {
+        this.drawDelete()
+      } else {
+        this.map.pm.toggleGlobalRemovalMode()
+      }
+      this.area = ''
+      this.wastebinCount = this.wastebins.length
+      this.classificationCount = this.classifications.length
     }
-
   }
 }
 </script>
@@ -144,7 +281,7 @@
   position: relative;
   .top-board{
     height: 100px;
-    width:300px;
+    min-width:250px;
     background-color: #ffffff;
     position: absolute;
     z-index:1001;
@@ -155,7 +292,7 @@
     align-items: center;
     padding:12px;
     .board-div{
-      width: 45%;
+      min-width: 80px;
       font-size:19px;
       text-align: center;
       .board-div-value{
diff --git a/src/views/wastebinClassificationManage/editWastebinC.vue b/src/views/wastebinClassificationManage/editWastebinC.vue
index 3bd263a..42bb247 100644
--- a/src/views/wastebinClassificationManage/editWastebinC.vue
+++ b/src/views/wastebinClassificationManage/editWastebinC.vue
@@ -48,7 +48,7 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="小区/路段" prop="road">
-                <el-input v-model.trim="wastebinForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+                <el-input v-model.trim="wastebinForm.road" :disabled="isDetailMode" type="text" placeholder=""/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -172,7 +172,7 @@
         position: '', // 位置：社区/道路
         lng: '', // 经度
         lat: '', // 纬度
-        isClassification: '0', // 是否分类箱
+        isClassification: '1', // 是否分类箱
         servicePeople: '', // 服务人口
         collectCompany: '', // 收集单位
         collectCar: '', // 收集车辆
@@ -290,7 +290,7 @@
         position: '', // 位置：社区/道路
         lng: '', // 经度
         lat: '', // 纬度
-        isClassification: '0', // 是否分类箱
+        isClassification: '1', // 是否分类箱
         servicePeople: '', // 服务人口
         collectCompany: '', // 收集单位
         collectCar: '', // 收集车辆
@@ -366,6 +366,8 @@
           }).catch((e) => {
             this.canEdit = true
           })
+        }else{
+          this.canEdit = true
         }
       })
     },
diff --git a/src/views/wastebinManage/editWastebin.vue b/src/views/wastebinManage/editWastebin.vue
index 32be8b7..a52c4e4 100644
--- a/src/views/wastebinManage/editWastebin.vue
+++ b/src/views/wastebinManage/editWastebin.vue
@@ -48,7 +48,7 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="小区/路段" prop="road">
-                <el-input v-model.trim="wastebinForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+                <el-input v-model.trim="wastebinForm.road" :disabled="isDetailMode" type="text" placeholder=""/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -366,6 +366,8 @@
           }).catch((e) => {
             this.canEdit = true
           })
+        } else {
+          this.canEdit = true
         }
       })
     },

diff --git a/config/index.js b/config/index.js
index 38e4787..9b31332 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/sanitation/',
+    assetsPublicPath: '/garbage/',
 
     /**
      * Source Maps
diff --git a/package.json b/package.json
index 233b655..9b08004 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
   "dependencies": {
     "@geoman-io/leaflet-geoman-free": "^2.9.0",
     "@jiaminghi/data-view": "^2.10.0",
+    "@turf/turf": "^6.3.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
     "babel-polyfill": "^6.26.0",
@@ -28,6 +29,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
+    "leaflet.pm": "^2.2.0",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/toilet.js b/src/api/biz/toilet.js
index 04bc9dd..6f33314 100644
--- a/src/api/biz/toilet.js
+++ b/src/api/biz/toilet.js
@@ -6,7 +6,7 @@
 // 公厕查询
 export function getToiletListPage(params) {
   return request({
-    url: '/sanitation/toilet/listPage',
+    url: '/gc/toilet/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 公厕查询
 export function getToiletList(pid) {
   return request({
-    url: '/sanitation/toilet/list',
+    url: '/gc/toilet/list',
     method: 'get',
     params: {
       pid: pid
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index ce32cbe..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -6,7 +6,7 @@
 // 垃圾桶查询
 export function getWastebinListPage(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/wastebin/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 垃圾桶查询
 export function getWastebinList(pid) {
   return request({
-    url: '/sanitation/wastebin/list',
+    url: '/gc/wastebin/list',
     method: 'get',
     params: {
       pid: pid
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/assets/overview/background2.jpg b/src/assets/overview/background2.jpg
deleted file mode 100644
index bfdc2d0..0000000
--- a/src/assets/overview/background2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/banner.png b/src/assets/overview/banner.png
deleted file mode 100644
index 1aa7105..0000000
--- a/src/assets/overview/banner.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/car.png b/src/assets/overview/car.png
deleted file mode 100644
index 75bfcda..0000000
--- a/src/assets/overview/car.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/circle.png b/src/assets/overview/circle.png
new file mode 100644
index 0000000..365c3fd
--- /dev/null
+++ b/src/assets/overview/circle.png
Binary files differ
diff --git a/src/assets/overview/classification.png b/src/assets/overview/classification.png
new file mode 100644
index 0000000..04027b7
--- /dev/null
+++ b/src/assets/overview/classification.png
Binary files differ
diff --git a/src/assets/overview/delete.png b/src/assets/overview/delete.png
new file mode 100644
index 0000000..ad92346
--- /dev/null
+++ b/src/assets/overview/delete.png
Binary files differ
diff --git a/src/assets/overview/frame.png b/src/assets/overview/frame.png
deleted file mode 100644
index 59a9b46..0000000
--- a/src/assets/overview/frame.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/highlight.png b/src/assets/overview/highlight.png
deleted file mode 100644
index 90bf755..0000000
--- a/src/assets/overview/highlight.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/module-horn.png b/src/assets/overview/module-horn.png
deleted file mode 100644
index 8383e5f..0000000
--- a/src/assets/overview/module-horn.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/polygon.png b/src/assets/overview/polygon.png
new file mode 100644
index 0000000..eb2791d
--- /dev/null
+++ b/src/assets/overview/polygon.png
Binary files differ
diff --git a/src/assets/overview/square.png b/src/assets/overview/square.png
new file mode 100644
index 0000000..999f95d
--- /dev/null
+++ b/src/assets/overview/square.png
Binary files differ
diff --git a/src/assets/overview/staff-yellow.png b/src/assets/overview/staff-yellow.png
deleted file mode 100644
index 434137e..0000000
--- a/src/assets/overview/staff-yellow.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/titleBg.png b/src/assets/overview/titleBg.png
deleted file mode 100644
index 758e022..0000000
--- a/src/assets/overview/titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet.png b/src/assets/overview/toilet.png
deleted file mode 100644
index 6d9fc05..0000000
--- a/src/assets/overview/toilet.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/toilet3d.png b/src/assets/overview/toilet3d.png
deleted file mode 100644
index 1a78e47..0000000
--- a/src/assets/overview/toilet3d.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-line2.png b/src/assets/overview/top-line2.png
deleted file mode 100644
index 61b9cfc..0000000
--- a/src/assets/overview/top-line2.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/top-titleBg.png b/src/assets/overview/top-titleBg.png
deleted file mode 100644
index 369945b..0000000
--- a/src/assets/overview/top-titleBg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/overview/transferstation.png b/src/assets/overview/transferstation.png
deleted file mode 100644
index 04027b7..0000000
--- a/src/assets/overview/transferstation.png
+++ /dev/null
Binary files differ
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/mapViews/mapView.vue b/src/views/mapViews/mapView.vue
index a0decda..2cf351a 100644
--- a/src/views/mapViews/mapView.vue
+++ b/src/views/mapViews/mapView.vue
@@ -1,6 +1,6 @@
 <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-map ref="map" :zoom="zoom" :crs="crsList[currentCrs].crs" :options="{zoomControl: false}" :center="center" style="width: 100%; height: 100%;" @ready="onReady">
       <l-tile-layer :url="mapurl"/>
       <l-tile-layer :url="labelurl"/>
       <!-- :options="{ zoomOffset:crsList[currentCrs].zoomOffset }"-->
@@ -63,7 +63,7 @@
       this.map.on('click', function(e) {
         that.$emit('click', e)
       })
-      this.$emit('ready')
+      this.$emit('ready', this.map)
     }
   }
 }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {
diff --git a/src/views/overview/components/drawTool.vue b/src/views/overview/components/drawTool.vue
new file mode 100644
index 0000000..8c0f98f
--- /dev/null
+++ b/src/views/overview/components/drawTool.vue
@@ -0,0 +1,72 @@
+<!--
+ * @Description: 图形框选工具
+ * @Author: 王晓颖
+ * @Date: 2021-03-10 09:50:44
+ -->
+<template>
+  <div class="draw-card">
+    <el-button title="绘制矩形选框" class="icon-btn" @click="draw('Rectangle')">
+      <img src="@/assets/overview/square.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制圆形选框" class="icon-btn" @click="draw('Circle')">
+      <img src="@/assets/overview/circle.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button title="绘制多边形选框" class="icon-btn" @click="draw('Polygon')">
+      <img src="@/assets/overview/polygon.png" style="height: 18px;width: 18px;">
+    </el-button>
+    <el-button v-show="clearShow" title="清除选区" class="icon-btn" @click="clear">
+      <img src="@/assets/overview/delete.png" style="height: 18px;width: 18px;">
+    </el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DrawTool',
+  props: {
+    squareShow: {
+      type: Boolean,
+      default: true
+    }, // 矩形框选工具是否开启
+    polygonShow: {
+      type: Boolean,
+      default: true
+    } // 多边形框选工具是否开启
+  },
+  data() {
+    return {
+      clearShow: false
+    }
+  },
+  methods: {
+    // 点击框选
+    draw(type) {
+      this.$notify({
+        title: '框选工具开启',
+        message: '您可以开始框选区域'
+      })
+      this.$emit('click', type)
+      this.clearShow = true
+    },
+    // 清除
+    clear() {
+      this.$emit('clear')
+      this.clearShow = false
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.draw-card{
+  margin: 0px 0px;
+  .icon-btn{
+    height: 40px;
+    width: 40px;
+    padding: 0px;
+    -moz-box-shadow: 0px 1px 3px #d9d9d9; /* 老的 Firefox */
+    box-shadow: 0px 1px 3px #d9d9d9;
+  }
+}
+
+</style>
diff --git a/src/views/overview/components/popwindow.vue b/src/views/overview/components/popwindow.vue
index 8c615c4..da7f5ee 100644
--- a/src/views/overview/components/popwindow.vue
+++ b/src/views/overview/components/popwindow.vue
@@ -5,51 +5,26 @@
  -->
 <template>
   <div class="info-window">
-    <!--人员详情-->
-    <div v-if="type=='staff'" class="info-header">人员详情</div>
-    <div v-if="type=='staff'&&data!=null" class="info-body">
-      <div>姓名：{{ data.name }}</div>
-      <div>性别：{{ data.sexName }}</div>
-      <div>联系电话：{{ data.tel }}</div>
-      <div>人员类别：{{ data.postName }}</div>
-      <div>负责片区：{{ data.responseArea }}</div>
-    </div>
-    <div v-if="type=='toilet'" class="info-header">公厕详情</div>
-    <div v-if="type=='toilet'&&data!=null" class="info-body">
-      <div>公厕编号：{{ data.code }}</div>
-      <div>公厕名称：{{ data.name }}</div>
-      <div>位置：{{ data.position }}</div>
-      <div>建设单位：{{ data.owner }}</div>
-      <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>占地面积：{{ data.area }}平方米</div>
-      <div>建设时间：{{ data.ts }}</div>
-    </div>
     <div v-if="type=='wastebin'" class="info-header">垃圾桶详情</div>
     <div v-if="type=='wastebin'&&data!=null" class="info-body">
       <div>垃圾桶编号：{{ data.code }}</div>
       <div>垃圾桶名称：{{ data.name }}</div>
+      <div>垃圾桶类别：{{ data.typeName }}</div>
       <div>位置：{{ data.position }}</div>
+      <div>收集单位：{{ data.collectCompany }}</div>
+      <div>收集车辆：{{ data.collectCar }}</div>
+      <div>收集频率：{{ data.collectFrequency }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>启用时间：{{ data.ts }}</div>
     </div>
-    <div v-if="type=='transferStation'" class="info-header">中转站详情</div>
-    <div v-if="type=='transferStation'&&data!=null" class="info-body">
-      <div>中转站编号：{{ data.code }}</div>
-      <div>中转站名称：{{ data.name }}</div>
+    <div v-if="type=='classification'" class="info-header">分类箱详情</div>
+    <div v-if="type=='classification'&&data!=null" class="info-body">
+      <div>分类箱编号：{{ data.code }}</div>
+      <div>分类箱名称：{{ data.name }}</div>
       <div>位置：{{ data.position }}</div>
-      <div>建设单位：{{ data.owner }}</div>
+      <div>收集单位：{{ data.collectCompany }}</div>
+      <div>收集车辆：{{ data.collectCar }}</div>
+      <div>收集频率：{{ data.collectFrequency }}</div>
       <div>负责人：{{ data.responsiblePerson }} ( {{ data.responsiblePersonTel }} )</div>
-      <div>占地面积：{{ data.area }}平方米</div>
-      <!--<div>最新垃圾量：{{ data.capacity }}立方米</div>-->
-      <div>建设时间：{{ data.ts }}</div>
-    </div>
-    <div v-if="type=='car'" class="info-header">车辆详情</div>
-    <div v-if="type=='car'&&data!=null" class="info-body">
-      <div>车牌号：{{ data.carCode }}</div>
-      <div>车辆描述：{{ data.description }}</div>
-      <div>车辆类型：{{ data.carTypeName }}</div>
-      <div>使用单位：{{ data.deptName }} </div>
-      <div>车速：{{ data.speed }}km/h</div>
     </div>
   </div>
 </template>
diff --git a/src/views/overview/components/toolsContainer.vue b/src/views/overview/components/toolsContainer.vue
new file mode 100644
index 0000000..f1e4478
--- /dev/null
+++ b/src/views/overview/components/toolsContainer.vue
@@ -0,0 +1,28 @@
+<!--
+ * @Description: 工具容器
+ * @Author: 王晓颖
+ * @Date: 2021-03-10 09:30:20
+ -->
+<template>
+  <div class="tools-container">
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ToolsContainer'
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.tools-container{
+  width:auto;
+  position: absolute;
+  right:50px;
+  top:20px;
+  z-index:10000;
+  display: flex;
+  justify-content: end;
+}
+</style>
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 4ca39b2..41c4793 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -9,33 +9,42 @@
     <div class="top-board">
       <div class="board-div">
         <div class="board-div-value">
-          3
+          {{ wastebinCount }}
         </div>
         <div class="board-div-title">
           垃圾桶
         </div>
       </div>
-      <el-divider direction="vertical"></el-divider>
+      <el-divider direction="vertical"/>
       <div class="board-div">
         <div class="board-div-value">
-          0
+          {{ classificationCount }}
         </div>
         <div class="board-div-title">
           分类箱
         </div>
       </div>
-    </div>
-    <map-view>
-      <!--人员显示-->
-      <div v-if="type=='staff'&&staffShow">
-        <l-marker v-for="(staff,index) in staffs" :key="'staff'+index" :icon="staffIcon" :lat-lng="staff.latlng" @click="openPopup($event,'staff',staff)">
-          <l-popup>
-            <popwindow :data="currentData" type="staff"/>
-          </l-popup>
-        </l-marker>
+      <div v-show="area!==''">
+        <el-divider direction="vertical"/>
       </div>
+      <div v-show="area" class="board-div">
+        <div class="board-div-value">
+          {{ area }} km²
+        </div>
+        <div class="board-div-title">
+          面积
+        </div>
+      </div>
+    </div>
+    <!--工具箱-->
+    <tools-container>
+      <!-- 绘制工具-->
+      <draw-tool @click="drawBox" @clear="clearDraw"/>
+    </tools-container>
+    <!--地图-->
+    <map-view @ready="mapInit">
       <!--设施显示-->
-      <div v-if="type=='device'">
+      <div>
         <div v-if="wastebinShow">
           <l-marker v-for="(wastebin,index) in wastebins" :key="'wastebin'+index" :icon="wastebinIcon" :lat-lng="wastebin.latlng" @click="openPopup($event,'wastebin',wastebin)">
             <l-popup @ready="fetchWastebinDetail">
@@ -43,10 +52,10 @@
             </l-popup>
           </l-marker>
         </div>
-        <div v-if="transferStationShow">
-          <l-marker v-for="(transferStation,index) in transferStations" :key="'transfer'+index" :icon="transferStationIcon" :lat-lng="transferStation.latlng" @click="openPopup($event,'transferStation',transferStation)">
-            <l-popup @ready="fetchTransferStationDetail">
-              <popwindow :data="currentData" type="transferStation"/>
+        <div v-if="classificationShow">
+          <l-marker v-for="(classification,index) in classifications" :key="'classification'+index" :icon="classificationIcon" :lat-lng="classification.latlng" @click="openPopup($event,'classification',classification)">
+            <l-popup @ready="fetchClassificationDetail">
+              <popwindow :data="currentData" type="classification"/>
             </l-popup>
           </l-marker>
         </div>
@@ -60,53 +69,50 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './components/popwindow'
-import { getWastebinListPage } from '@/api/biz/wastebin'
-
+import { getWastebinList } from '@/api/biz/wastebin'
+import ToolsContainer from './components/toolsContainer'
+import DrawTool from './components/drawTool'
+import 'leaflet.pm'
+import 'leaflet.pm/dist/leaflet.pm.css'
+import * as turf from '@turf/turf'
 export default {
   name: 'MapOverview',
-  components: { Popwindow, MapView, LMarker, LIcon, LPopup },
+  components: { DrawTool, ToolsContainer, Popwindow, MapView, LMarker, LIcon, LPopup },
   data() {
     return {
-      type: 'device', // 地图显示类型: staff人员， device设施， car 车辆
-      staffs: [], // 人员列表
+      map: null, // 地图
+      drawLayer: null, // 绘制图层
       wastebins: [], // 垃圾桶列表
-      transferStations: [], // 垃圾中转站列表
-      toilets: [], // 公厕
-      cars: [], // 车辆
-      staffIcon: L.icon({
-        iconUrl: require('@/assets/overview/staff-yellow.png'),
-        iconSize: [32, 32],
-        iconAnchor: [16, 32]
-      }), // 人员图标
-      toiletIcon: L.icon({
-        iconUrl: require('@/assets/overview/toilet.png'),
-        iconSize: [32, 32],
-        iconAnchor: [16, 32]
-      }), // 公厕图标
+      classifications: [], // 垃圾中转站列表
+      wastebinCount: 0,
+      classificationCount: 0,
       wastebinIcon: L.icon({
         iconUrl: require('@/assets/overview/wastebin.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
       }), // 垃圾桶图标
-      transferStationIcon: L.icon({
-        iconUrl: require('@/assets/overview/transferstation.png'),
+      classificationIcon: L.icon({
+        iconUrl: require('@/assets/overview/classification.png'),
         iconSize: [32, 32],
         iconAnchor: [16, 32]
-      }), // 转运站图标
-      staffShow: true, // 人员是否显示
+      }), // 分类箱图标
       wastebinShow: true, // 垃圾桶是否显示
-      transferStationShow: true, // 转运站是否显示
-      toiletShow: true, // 公厕是否显示
-      carShow: true, // 车辆是否显示
-      currentData: {} // 当前弹窗数据
+      classificationShow: true, // 分类箱是否显示
+      currentData: {}, // 当前弹窗数据
+      area: '' // 选区面积
     }
   },
   created() {
     this.getWastebins()
   },
   methods: {
+    // 地图初始化完毕
+    mapInit(map) {
+      this.map = map
+      this.map.pm.setLang('zh')
+    },
     // 获取垃圾桶列表
-    getWastebins() {
+    getWastebins: function() {
       // this.wastebins = [
       //   { id: '12346', name: '李四', latlng: [27.73252, 116.05321], lng: 27.73252, lat: 116.05321, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '0', responseArea: '崇仁县', responseAreaName: '崇仁县' },
       //   { id: '12347', name: '王五', latlng: [27.72852, 116.03721], lng: 27.72852, lat: 116.03721, sex: '0', tel: '13382739123', type: '0', typeName: '普通职工', post: '1', jobs: '1', responseArea: '崇仁县', responseAreaName: '崇仁县' }
@@ -117,22 +123,153 @@
         sort: '',
         order: 'desc'
       }
-      getWastebinListPage(params).then(response => {
+      getWastebinList(params).then(response => {
         if (response.code === 200) {
-          this.wastebins = response.data.rows.map(item => {
+          this.wastebins = response.data.filter(item => item.isClassification === 0)
+          this.wastebins = this.wastebins.map(item => {
             return {
               ...item,
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
             }
           })
+          this.wastebinCount = this.wastebins.length
+          this.classifications = response.data.filter(item => item.isClassification === 1)
+          this.classifications = this.classifications.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+          this.classificationCount = this.classifications.length
         }
       })
     },
     // 获取垃圾桶详情
     fetchWastebinDetail(data) {
       this.currentData = data
+    },
+    // 获取分类箱详情
+    fetchClassificationDetail(data) {
+      this.currentData = data
+    },
+    // 打开弹窗
+    async openPopup(event, type, data) {
+      switch (type) {
+        case 'wastebin':
+          await this.fetchWastebinDetail(data)
+          break
+        case 'classification':
+          await this.fetchClassificationDetail(data)
+          break
+      }
+      this.$nextTick(() => {
+        event.target.openPopup()
+      })
+    },
+    // 移除绘制图层
+    drawDelete() {
+      if (this.drawLayer) {
+        this.drawLayer.layer.remove()
+      }
+      if (this.map.graphics) {
+        this.map.graphics.forEach(graphic => {
+          this.map.removeLayer(graphic.layer)
+        })
+      }
+    },
+    // 绘制选框
+    drawBox(type) {
+      console.log(this.map)
+      this.drawDelete()
+      this.$nextTick(() => {
+        this.map.pm.enableDraw(type, {
+          snappable: false
+        })
+        // 绘制完成
+        this.map.on('pm:create', e => {
+          this.drawLayer = e
+          // debugger
+          // 计算面积
+          var area
+          if (e.shape === 'Circle') {
+            // 计算面积
+            const radius = e.layer.options.radius
+            const latlng = e.layer.getLatLng()
+            area = 3.1415926 * radius * radius
+            this.area = (area / 1000000).toFixed(2)
+            const circle = turf.circle([latlng.lng, latlng.lat], radius / 1000)
+            // 依次判断点的存在
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
+          } else {
+            // 获取选区的geojson, 用turf计算面积
+            const geojson = e.layer.toGeoJSON()
+            area = turf.area(geojson)
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
+          }
+          this.area = (area / 1000000).toFixed(2)
+          console.log('面积' + area.toString())
+          // 计算区域内的垃圾桶和分类箱个数
+        })
+      })
+    },
+    judgePointInPolygon(p, geojson) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      // 2. 多边形
+      const polygon = geojson.geometry
+      const result = turf.booleanPointInPolygon(point, polygon)
+      if (result) {
+        console.log('is in polygon')
+      }
+      return result
+    },
+    // 判断点是否在圆里
+    judgePointInCircle(p, circle) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      const result = turf.booleanPointInPolygon(point, circle)
+      if (result) {
+        console.log('is in circle')
+      }
+      return result
+    },
+    // 清除绘制
+    clearDraw() {
+      if (this.drawLayer) {
+        this.drawDelete()
+      } else {
+        this.map.pm.toggleGlobalRemovalMode()
+      }
+      this.area = ''
+      this.wastebinCount = this.wastebins.length
+      this.classificationCount = this.classifications.length
     }
-
   }
 }
 </script>
@@ -144,7 +281,7 @@
   position: relative;
   .top-board{
     height: 100px;
-    width:300px;
+    min-width:250px;
     background-color: #ffffff;
     position: absolute;
     z-index:1001;
@@ -155,7 +292,7 @@
     align-items: center;
     padding:12px;
     .board-div{
-      width: 45%;
+      min-width: 80px;
       font-size:19px;
       text-align: center;
       .board-div-value{
diff --git a/src/views/wastebinClassificationManage/editWastebinC.vue b/src/views/wastebinClassificationManage/editWastebinC.vue
index 3bd263a..42bb247 100644
--- a/src/views/wastebinClassificationManage/editWastebinC.vue
+++ b/src/views/wastebinClassificationManage/editWastebinC.vue
@@ -48,7 +48,7 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="小区/路段" prop="road">
-                <el-input v-model.trim="wastebinForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+                <el-input v-model.trim="wastebinForm.road" :disabled="isDetailMode" type="text" placeholder=""/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -172,7 +172,7 @@
         position: '', // 位置：社区/道路
         lng: '', // 经度
         lat: '', // 纬度
-        isClassification: '0', // 是否分类箱
+        isClassification: '1', // 是否分类箱
         servicePeople: '', // 服务人口
         collectCompany: '', // 收集单位
         collectCar: '', // 收集车辆
@@ -290,7 +290,7 @@
         position: '', // 位置：社区/道路
         lng: '', // 经度
         lat: '', // 纬度
-        isClassification: '0', // 是否分类箱
+        isClassification: '1', // 是否分类箱
         servicePeople: '', // 服务人口
         collectCompany: '', // 收集单位
         collectCar: '', // 收集车辆
@@ -366,6 +366,8 @@
           }).catch((e) => {
             this.canEdit = true
           })
+        }else{
+          this.canEdit = true
         }
       })
     },
diff --git a/src/views/wastebinManage/editWastebin.vue b/src/views/wastebinManage/editWastebin.vue
index 32be8b7..a52c4e4 100644
--- a/src/views/wastebinManage/editWastebin.vue
+++ b/src/views/wastebinManage/editWastebin.vue
@@ -48,7 +48,7 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="小区/路段" prop="road">
-                <el-input v-model.trim="wastebinForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+                <el-input v-model.trim="wastebinForm.road" :disabled="isDetailMode" type="text" placeholder=""/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -366,6 +366,8 @@
           }).catch((e) => {
             this.canEdit = true
           })
+        } else {
+          this.canEdit = true
         }
       })
     },
diff --git a/src/views/wastebinManage/wastebinList.vue b/src/views/wastebinManage/wastebinList.vue
index a819534..b496b24 100644
--- a/src/views/wastebinManage/wastebinList.vue
+++ b/src/views/wastebinManage/wastebinList.vue
@@ -117,7 +117,7 @@
         },
         {
           text: '收集频率',
-          value: 'ts',
+          value: 'collectFrequency',
           align: 'center'
         },
         {