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}

位置:${item.detailedLocation}

-

租赁情况:${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}

+

租赁情况:${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}

`; //
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index f4ff188..b0653f9 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -17,12 +17,16 @@ let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; +<<<<<<< HEAD baseURL = 'http://128.10.249.26:9003'; +======= + // baseURL = 'http://128.10.249.23:9003'; +>>>>>>> 2727043f776460ef29f119ecf30a65f746104338 } else { diff --git a/admin-web-master/src/views/detect/admap copy 4.vue b/admin-web-master/src/views/detect/admap copy 4.vue new file mode 100644 index 0000000..db9c6f1 --- /dev/null +++ b/admin-web-master/src/views/detect/admap copy 4.vue @@ -0,0 +1,758 @@ + + + + diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue index db9c6f1..ec31179 100644 --- a/admin-web-master/src/views/detect/admap.vue +++ b/admin-web-master/src/views/detect/admap.vue @@ -5,14 +5,139 @@
招商资源监测 > 资源地图
+
+
+
+
+
+ 租赁情况 +
+
+ {{publishStatusinfo.source}} +
+
+ + + + + + + + +
+ +
+
+
+
+
+
+ 绿道段 +
+
+ {{belongingGreenwaySectioninfo.source}} +
+
+ + + + +
+ +
+
+
+
+
+
+ 绿道公园 +
+
+ {{belongingParkTrailinfo.source}} +
+
+ + + + +
+ +
+
+
+
+
+
+ 资源数量 +
+
+ {{alllistnum}} +
+
+ + + + + + +
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
+
查询
+
+
+
+
{{ item.name }}
+
+
商铺 @@ -54,7 +186,8 @@ @@ -74,7 +207,7 @@ @@ -126,7 +259,7 @@ --> @@ -156,9 +289,9 @@ - + @@ -182,7 +315,7 @@ --> @@ -221,7 +354,8 @@
{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }} > 新增
+ style="padding:0 5px;">> 新增 +
@@ -247,7 +381,8 @@
{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }} > 查看
+ style="padding:0 5px;">> 查看 +
@@ -263,7 +398,8 @@
{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }} > {{contractChangeReason}}
+ style="padding:0 5px;">> {{contractChangeReason}} +
@@ -277,7 +413,8 @@
- +
@@ -288,8 +425,17 @@ import { cereResourceStrategy, editStatus, - cereBusinessOperationadd - } from '../../api/newly.js' + cereBusinessOperationadd, + + rentalSituationStatistics, + areaShopStatistics, + areaParkStatistics + } from '@/api/newly.js' + import { + gongyuan, + lvdaoduan, + parkTrails + } from '@/api/information.js'; import { ceGetAll } from '../../api/sam.js' @@ -314,7 +460,56 @@ export default { data() { return { - oncetype:'', + alllistnum: 0, + typelist: [{ + name: '已租赁', + background: '#2AB867', + }, + { + name: '已发布', + background: '#4A77C9', + }, + { + name: '不通过', + background: '#E75A46', + }, + { + name: '待审核', + background: '#ECAF5C', + }, + { + name: '待发布', + background: '#707B86', + }, + ], + pagequerycd: { + district: '', + venueType: '' + }, + pagequeryshop: { + belongingRegion: '', + belongingDepartment: '', + shopType: '' + }, + allpublishStatus: '', + lvdaoList: [], + gongyuanList: [], + topinfo: { + publishStatus: '', + belongingGreenwaySection: '', + belongingParkTrail: '', + type: '' + }, + publishStatusinfo: { + source: 0 + }, + belongingGreenwaySectioninfo: { + source: 0 + }, + belongingParkTrailinfo: { + source: 0 + }, + oncetype: '', name: '', oninfo: {}, celueData: [], @@ -341,6 +536,17 @@ }, } }, + computed: { + regionOptions() { + return this.$store.state.cent.regionList; + }, + typeShopList() { + return this.$store.state.cent.typeShopList; + }, + siteTypeList() { + return this.$store.state.cent.siteTypeList; + } + }, components: { mapchakannew, cl, @@ -352,10 +558,95 @@ add, resourceCommodity, }, - created() { + async created() { + const lvdao = await lvdaoduan() + const gongyua = await parkTrails() + this.lvdaoList = lvdao.data.concat(gongyua.data) + const budao = await gongyuan() + this.gongyuanList = budao.data.concat(gongyua.data) this.getAll() + this.changepublishStatus() + this.changebelongingGreenwaySection() + this.changebelongingParkTrail() + this.changetype() }, methods: { + gettypeShopList(code) { + if (!code) { + return '无'; + } + for (let i = 0; i < this.typeShopList.length; i++) { + const item = this.typeShopList[i]; + item.value = item.value + '' + if (item.value === code) { + return item.label; + } + } + return '无'; + }, + changepublishStatus() { + rentalSituationStatistics({ + rentalStatus: this.topinfo.publishStatus + }).then(res => { + console.error(res) + this.publishStatusinfo = res.data + }) + }, + changebelongingGreenwaySection() { + areaShopStatistics({ + belongingGreenwaySection: this.topinfo.belongingGreenwaySection + }).then(res => { + console.error(res) + this.belongingGreenwaySectioninfo = res.data + }) + }, + async changetype() { + let nums = 0 + if (this.topinfo.type == '') { + const res = await getAlls({ + pageNumber: 0, + pageSize: 1, + }) + nums = nums + res.data.totalElements + const res1 = await likeGet({ + pageNumber: 0, + pageSize: 1, + }) + nums = nums + res1.data.totalElements + const res2 = await changAlls({ + pageNumber: 0, + pageSize: 1, + }) + nums = nums + res2.data.totalElements + } else if (this.topinfo.type == '0') { + const res = await getAlls({ + pageNumber: 0, + pageSize: 1, + }) + nums = nums + res.data.totalElements + } else if (this.topinfo.type == '1') { + const res = await likeGet({ + pageNumber: 0, + pageSize: 1, + }) + nums = nums + res.data.totalElements + } else if (this.topinfo.type == '2') { + const res = await changAlls({ + pageNumber: 0, + pageSize: 1, + }) + nums = nums + res.data.totalElements + } + this.alllistnum = nums + }, + changebelongingParkTrail() { + areaParkStatistics({ + belongingParkTrail: this.topinfo.belongingParkTrail + }).then(res => { + console.error(res) + this.belongingParkTrailinfo = res.data + }) + }, minSev(e) { this.multipleSelection = e console.error(this.multipleSelection) @@ -368,13 +659,13 @@ resourcesId: this.oncetype + this.oninfo.id, rentalPoliciesIds: ids, } - if(c1.rentalPoliciesIds.length==0){ - this.$message({ - message: '请选择策略进行绑定', - type: 'warning' - }) - return - } + if (c1.rentalPoliciesIds.length == 0) { + this.$message({ + message: '请选择策略进行绑定', + type: 'warning' + }) + return + } console.error(c1) cereResourceStrategy(c1).then(res => { if (res.code == 200) { @@ -424,7 +715,7 @@ this.getAll() this.$forceUpdate(); }, 10) - + }, gettime() { // 获取当前时间 @@ -568,21 +859,26 @@ if (this.ontype == '1') { const res = await getAlls({ ...this.pagequery, - shopName: this.name + shopName: this.name, + publishStatus: this.allpublishStatus, + ...this.pagequeryshop }) this.tableData = res.data.content this.total = res.data.totalElements } else if (this.ontype == '2') { const res = await likeGet({ ...this.pagequery, - advertisingName: this.name + advertisingName: this.name, + publishStatus: this.allpublishStatus }) this.tableData = res.data.content this.total = res.data.totalElements } else if (this.ontype == '3') { const res = await changAlls({ ...this.pagequery, - venueName: this.name + venueName: this.name, + publishStatus: this.allpublishStatus, + ...this.pagequerycd }) this.tableData = res.data.content this.total = res.data.totalElements @@ -617,6 +913,16 @@ pageSize: 10, }, this.name = '' + this.allpublishStatus = '' + this.pagequeryshop = { + belongingRegion: '', + belongingDepartment: '', + shopType: '' + } + this.pagequerycd = { + district: '', + venueType: '' + } this.getAll() }, //删除 @@ -721,6 +1027,37 @@ }