diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip index 28a863d..45250fa 100644 --- a/admin-web-master/dist.zip +++ b/admin-web-master/dist.zip 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 --- a/admin-web-master/src/assets/images/icon1.png +++ /dev/null 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 --- a/admin-web-master/src/assets/images/icon2.png +++ /dev/null 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 --- a/admin-web-master/src/assets/images/icon3.png +++ /dev/null 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 --- a/admin-web-master/src/assets/images/icon4.png +++ /dev/null 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 --- a/admin-web-master/src/assets/images/icon5.png +++ /dev/null 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 --- a/admin-web-master/src/assets/images/icon6.png +++ /dev/null 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 --- /dev/null +++ b/admin-web-master/src/assets/images/iconcd1.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/iconcd2.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/iconcd3.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/iconcd4.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/iconcd5.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/icongg1.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/icongg2.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/icongg3.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/icongg4.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/icongg5.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/iconsp1.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/iconsp2.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/iconsp3.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/iconsp4.png 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 --- /dev/null +++ b/admin-web-master/src/assets/images/iconsp5.png 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}
-租赁情况:
租赁情况: