From 2727043f776460ef29f119ecf30a65f746104338 Mon Sep 17 00:00:00 2001 From: wesley88 <9519127+wesley88@user.noreply.gitee.com> Date: Fri, 28 Mar 2025 17:39:15 +0800 Subject: [PATCH] 1 --- admin-web-master/dist.zip | Bin 6346140 -> 0 bytes admin-web-master/src/api/newly.js | 25 +++++++++++++++++++++++++ admin-web-master/src/assets/images/icon1.png | Bin 14973 -> 0 bytes admin-web-master/src/assets/images/icon2.png | Bin 13301 -> 0 bytes admin-web-master/src/assets/images/icon3.png | Bin 14779 -> 0 bytes admin-web-master/src/assets/images/icon4.png | Bin 3538 -> 0 bytes admin-web-master/src/assets/images/icon5.png | Bin 3439 -> 0 bytes admin-web-master/src/assets/images/icon6.png | Bin 3709 -> 0 bytes admin-web-master/src/assets/images/iconcd1.png | Bin 0 -> 3519 bytes admin-web-master/src/assets/images/iconcd2.png | Bin 0 -> 3455 bytes admin-web-master/src/assets/images/iconcd3.png | Bin 0 -> 3531 bytes admin-web-master/src/assets/images/iconcd4.png | Bin 0 -> 3546 bytes admin-web-master/src/assets/images/iconcd5.png | Bin 0 -> 3514 bytes admin-web-master/src/assets/images/icongg1.png | Bin 0 -> 3613 bytes admin-web-master/src/assets/images/icongg2.png | Bin 0 -> 3564 bytes admin-web-master/src/assets/images/icongg3.png | Bin 0 -> 3718 bytes admin-web-master/src/assets/images/icongg4.png | Bin 0 -> 3616 bytes admin-web-master/src/assets/images/icongg5.png | Bin 0 -> 3671 bytes admin-web-master/src/assets/images/iconsp1.png | Bin 0 -> 3545 bytes admin-web-master/src/assets/images/iconsp2.png | Bin 0 -> 3417 bytes admin-web-master/src/assets/images/iconsp3.png | Bin 0 -> 3590 bytes admin-web-master/src/assets/images/iconsp4.png | Bin 0 -> 3551 bytes admin-web-master/src/assets/images/iconsp5.png | Bin 0 -> 3550 bytes admin-web-master/src/components/newmap/map.vue | 11 ++++++----- admin-web-master/src/utils/request.js | 4 ++-- admin-web-master/src/views/detect/admap copy 4.vue | 758 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ admin-web-master/src/views/detect/admap.vue | 391 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------- admin-web-master/src/views/detect/information/index.vue | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------- admin-web-master/src/views/detect/map/index.vue | 14 +++++++++++++- 29 files changed, 1264 insertions(+), 99 deletions(-) delete mode 100644 admin-web-master/src/assets/images/icon1.png delete mode 100644 admin-web-master/src/assets/images/icon2.png delete mode 100644 admin-web-master/src/assets/images/icon3.png delete mode 100644 admin-web-master/src/assets/images/icon4.png delete mode 100644 admin-web-master/src/assets/images/icon5.png delete mode 100644 admin-web-master/src/assets/images/icon6.png create mode 100644 admin-web-master/src/assets/images/iconcd1.png create mode 100644 admin-web-master/src/assets/images/iconcd2.png create mode 100644 admin-web-master/src/assets/images/iconcd3.png create mode 100644 admin-web-master/src/assets/images/iconcd4.png create mode 100644 admin-web-master/src/assets/images/iconcd5.png create mode 100644 admin-web-master/src/assets/images/icongg1.png create mode 100644 admin-web-master/src/assets/images/icongg2.png create mode 100644 admin-web-master/src/assets/images/icongg3.png create mode 100644 admin-web-master/src/assets/images/icongg4.png create mode 100644 admin-web-master/src/assets/images/icongg5.png create mode 100644 admin-web-master/src/assets/images/iconsp1.png create mode 100644 admin-web-master/src/assets/images/iconsp2.png create mode 100644 admin-web-master/src/assets/images/iconsp3.png create mode 100644 admin-web-master/src/assets/images/iconsp4.png create mode 100644 admin-web-master/src/assets/images/iconsp5.png create mode 100644 admin-web-master/src/views/detect/admap copy 4.vue diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip index 28a863d..45250fa 100644 Binary files a/admin-web-master/dist.zip and b/admin-web-master/dist.zip differ diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js index f92c7f5..2b29d8f 100644 --- a/admin-web-master/src/api/newly.js +++ b/admin-web-master/src/api/newly.js @@ -1,6 +1,31 @@ import request from '@/utils/request' // import request from '@/utils/request2' + +// 租赁情况统计 +export function rentalSituationStatistics(data) { + return request({ + url: '/statistical/rentalSituationStatistics', + method: 'post', + data + }) +} +// 绿道段统计 +export function areaShopStatistics(data) { + return request({ + url: '/statistical/areaShopStatistics', + method: 'post', + data + }) +} +// 绿道公园统计 +export function areaParkStatistics(data) { + return request({ + url: '/statistical/areaParkStatistics', + method: 'post', + data + }) +} // 字典 export function getChilds(data) { return request({ diff --git a/admin-web-master/src/assets/images/icon1.png b/admin-web-master/src/assets/images/icon1.png deleted file mode 100644 index 86101c8..0000000 Binary files a/admin-web-master/src/assets/images/icon1.png and /dev/null differ diff --git a/admin-web-master/src/assets/images/icon2.png b/admin-web-master/src/assets/images/icon2.png deleted file mode 100644 index 0df6f4b..0000000 Binary files a/admin-web-master/src/assets/images/icon2.png and /dev/null differ diff --git a/admin-web-master/src/assets/images/icon3.png b/admin-web-master/src/assets/images/icon3.png deleted file mode 100644 index 46dc48f..0000000 Binary files a/admin-web-master/src/assets/images/icon3.png and /dev/null differ diff --git a/admin-web-master/src/assets/images/icon4.png b/admin-web-master/src/assets/images/icon4.png deleted file mode 100644 index db25234..0000000 Binary files a/admin-web-master/src/assets/images/icon4.png and /dev/null differ diff --git a/admin-web-master/src/assets/images/icon5.png b/admin-web-master/src/assets/images/icon5.png deleted file mode 100644 index fac07c8..0000000 Binary files a/admin-web-master/src/assets/images/icon5.png and /dev/null differ diff --git a/admin-web-master/src/assets/images/icon6.png b/admin-web-master/src/assets/images/icon6.png deleted file mode 100644 index 9d2b45e..0000000 Binary files a/admin-web-master/src/assets/images/icon6.png and /dev/null differ diff --git a/admin-web-master/src/assets/images/iconcd1.png b/admin-web-master/src/assets/images/iconcd1.png new file mode 100644 index 0000000..08421e3 Binary files /dev/null and b/admin-web-master/src/assets/images/iconcd1.png differ diff --git a/admin-web-master/src/assets/images/iconcd2.png b/admin-web-master/src/assets/images/iconcd2.png new file mode 100644 index 0000000..01e3b51 Binary files /dev/null and b/admin-web-master/src/assets/images/iconcd2.png differ diff --git a/admin-web-master/src/assets/images/iconcd3.png b/admin-web-master/src/assets/images/iconcd3.png new file mode 100644 index 0000000..c6f8a3a Binary files /dev/null and b/admin-web-master/src/assets/images/iconcd3.png differ diff --git a/admin-web-master/src/assets/images/iconcd4.png b/admin-web-master/src/assets/images/iconcd4.png new file mode 100644 index 0000000..638dffd Binary files /dev/null and b/admin-web-master/src/assets/images/iconcd4.png differ diff --git a/admin-web-master/src/assets/images/iconcd5.png b/admin-web-master/src/assets/images/iconcd5.png new file mode 100644 index 0000000..07c244b Binary files /dev/null and b/admin-web-master/src/assets/images/iconcd5.png differ diff --git a/admin-web-master/src/assets/images/icongg1.png b/admin-web-master/src/assets/images/icongg1.png new file mode 100644 index 0000000..9827b43 Binary files /dev/null and b/admin-web-master/src/assets/images/icongg1.png differ diff --git a/admin-web-master/src/assets/images/icongg2.png b/admin-web-master/src/assets/images/icongg2.png new file mode 100644 index 0000000..95c4f53 Binary files /dev/null and b/admin-web-master/src/assets/images/icongg2.png differ diff --git a/admin-web-master/src/assets/images/icongg3.png b/admin-web-master/src/assets/images/icongg3.png new file mode 100644 index 0000000..994b6d3 Binary files /dev/null and b/admin-web-master/src/assets/images/icongg3.png differ diff --git a/admin-web-master/src/assets/images/icongg4.png b/admin-web-master/src/assets/images/icongg4.png new file mode 100644 index 0000000..0aaaa83 Binary files /dev/null and b/admin-web-master/src/assets/images/icongg4.png differ diff --git a/admin-web-master/src/assets/images/icongg5.png b/admin-web-master/src/assets/images/icongg5.png new file mode 100644 index 0000000..22462c6 Binary files /dev/null and b/admin-web-master/src/assets/images/icongg5.png differ diff --git a/admin-web-master/src/assets/images/iconsp1.png b/admin-web-master/src/assets/images/iconsp1.png new file mode 100644 index 0000000..1ec4dfc Binary files /dev/null and b/admin-web-master/src/assets/images/iconsp1.png differ diff --git a/admin-web-master/src/assets/images/iconsp2.png b/admin-web-master/src/assets/images/iconsp2.png new file mode 100644 index 0000000..5a1f728 Binary files /dev/null and b/admin-web-master/src/assets/images/iconsp2.png differ diff --git a/admin-web-master/src/assets/images/iconsp3.png b/admin-web-master/src/assets/images/iconsp3.png new file mode 100644 index 0000000..b01dd66 Binary files /dev/null and b/admin-web-master/src/assets/images/iconsp3.png differ diff --git a/admin-web-master/src/assets/images/iconsp4.png b/admin-web-master/src/assets/images/iconsp4.png new file mode 100644 index 0000000..c102648 Binary files /dev/null and b/admin-web-master/src/assets/images/iconsp4.png differ diff --git a/admin-web-master/src/assets/images/iconsp5.png b/admin-web-master/src/assets/images/iconsp5.png new file mode 100644 index 0000000..78d8320 Binary files /dev/null and b/admin-web-master/src/assets/images/iconsp5.png differ diff --git a/admin-web-master/src/components/newmap/map.vue b/admin-web-master/src/components/newmap/map.vue index 4f46688..3514401 100644 --- a/admin-web-master/src/components/newmap/map.vue +++ b/admin-web-master/src/components/newmap/map.vue @@ -65,15 +65,16 @@ export default { // 遍历 message 数组,为每个位置创建一个标记 if (e.length > 0) { e.forEach(item => { + // console.error( item) let list = this.ontype == '1' ? item.mapPunctuation.split(',') : this.ontype == '2' ? item.mapPunctuation.split(',') : this.ontype == '3' ? item.mapMarker.split(',') : []; item.lat = parseFloat(list[0]); item.lng = parseFloat(list[1]); item.name = this.ontype == '1' ? item.shopName : this.ontype == '2' ? item.advertisingName : this.ontype == '3' ? item.venueName :'无'; const markerLatLng = new qq.maps.LatLng(item.lat, item.lng); - const customIconUrl1 = require('@/assets/images/icon4.png'); // 确保返回的是 URL 字符串 - const customIconUrl2 = require('@/assets/images/icon6.png'); // 确保返回的是 URL 字符串 - const customIconUrl3 = require('@/assets/images/icon5.png'); // 确保返回的是 URL 字符串 - const icon = this.ontype == '1'?customIconUrl1:this.ontype == '2'?customIconUrl2:this.ontype =='3'?customIconUrl3:'' + const customIconUrl1 = require(item.publishStatus=='0'?'@/assets/images/iconsp1.png':item.publishStatus=='1'?'@/assets/images/iconsp2.png':item.publishStatus=='2'?'@/assets/images/iconsp3.png':item.publishStatus=='3'?'@/assets/images/iconsp4.png':item.publishStatus=='4'?'@/assets/images/iconsp5.png':'@/assets/images/iconsp1.png'); // 确保返回的是 URL 字符串 + const customIconUrl2 = require(item.publishStatus=='0'?'@/assets/images/icongg1.png':item.publishStatus=='1'?'@/assets/images/icongg2.png':item.publishStatus=='2'?'@/assets/images/icongg3.png':item.publishStatus=='3'?'@/assets/images/icongg4.png':item.publishStatus=='4'?'@/assets/images/icongg5.png':'@/assets/images/icongg1.png'); // 确保返回的是 URL 字符串 + const customIconUrl3 = require(item.publishStatus=='0'?'@/assets/images/iconcd1.png':item.publishStatus=='1'?'@/assets/images/iconcd2.png':item.publishStatus=='2'?'@/assets/images/iconcd3.png':item.publishStatus=='3'?'@/assets/images/iconcd4.png':item.publishStatus=='4'?'@/assets/images/iconcd5.png':'@/assets/images/iconcd1.png'); // 确保返回的是 URL 字符串 + const icon = this.ontype == '1'?customIconUrl1:this.ontype == '2'?customIconUrl2:this.ontype =='3'?customIconUrl3:'' const marker = new qq.maps.Marker({ position: markerLatLng, map: this.map, @@ -95,7 +96,7 @@ export default {
资源名称:${item.name}
-租赁情况:
租赁情况: