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/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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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..c804587 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 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/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 @@