+
@@ -44,75 +44,95 @@ export default {
},
mounted() {
// 初始化地图
- this.initMap(this.message);
+ // this.initMap(this.message);
},
methods: {
initMap(e) {
// 将经纬度转换为腾讯地图的LatLng对象
- const centerLatLng = new qq.maps.LatLng(this.lat, this.lng);
+ const centerLatLng = new TMap.LatLng(this.lat, this.lng);
// 创建地图实例
- this.map = new qq.maps.Map(document.getElementById('mapContainer'), {
+ this.map = new TMap.Map(document.getElementById("mapContainer"), {
center: centerLatLng,
- zoom: 13
+ zoom: 13,
+ mapStyleId: 'style1'
});
-
+ // return
// 创建信息窗口实例
- this.infoWindow = new qq.maps.InfoWindow({
- map: this.map
+ this.infowindow = new TMap.InfoWindow({
+ map: this.map,
+ position: centerLatLng,
+ offset: { x: 0, y: -20 } //设置信息窗相对position偏移像素，为了使其显示在Marker的上方
});
-
+ this.infowindow.close();//初始关闭信息窗关闭
+ const listall = []
+ const listallstyles = {}
// 遍历 message 数组，为每个位置创建一个标记
if (e.length > 0) {
e.forEach(item => {
// console.error( item)
+ let idstyles ='Style'+item.id
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(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 markerLatLng = new TMap.LatLng(item.lat, item.lng);
+ 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');
+ 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');
+ 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');
+ // const customIconUrl1 = 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';
+ // const customIconUrl2 = 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';
+ // const customIconUrl3 = 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';
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,
- icon:icon
- });
-
- // 为标记添加点击事件监听器
- qq.maps.event.addListener(marker, 'click', () => {
- this.showInfoWindow(marker, item);
- });
-
- this.markers.push(marker);
+ // const icon = 'https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/test/file/static/zjjf.png'
+ let infoitem = {
+ "styleId":idstyles,
+ "id": item.id,
+ "position": markerLatLng,
+ "icon":icon,
+ "properties":item
+ }
+
+ listallstyles[idstyles] = new TMap.MarkerStyle({
+ "width": 51, // 点标记样式宽度（像素）
+ "height": 52, // 点标记样式高度（像素）
+ "src": icon, //图片路径
+ //焦点在图片中的像素位置，一般大头针类似形式的图片以针尖位置做为焦点，圆形点以圆心位置为焦点
+ // "anchor": { x: 16, y: 32 }
+ })
+ listall.push(infoitem)
+ });
+ console.error(listallstyles )
+ this.marker = new TMap.MultiMarker({
+ styles:listallstyles,
+ map: this.map, //指定地图容器
+ geometries:listall
});
+ this.marker.on("click", this.showInfoWindow)
}
},
- showInfoWindow(marker, item) {
+ showInfoWindow(event) {
+ console.error(event)
+ let lat = event.latLng.getLat().toFixed(6);
+ let lng = event.latLng.getLng().toFixed(6);
+ let item = event.geometry.properties
// 设置信息窗口的内容
const content = `
-
-
资源名称:${item.name}
+
+
资源名称:${item.name}
位置:${item.detailedLocation}
租赁情况:${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}
`;
- //
- //
- //
- // ${item.name}
- //
- //
- // ${item.detailedLocation}
- //
- //
- //
- // 设置信息窗口的位置和内容
- this.infoWindow.setPosition(marker.getPosition());
- this.infoWindow.setContent(content);
- this.infoWindow.open();
+ this.infowindow.open(); //打开信息窗
+ this.infowindow.setPosition(new TMap.LatLng(lat,lng));//设置信息窗位置
+ this.infowindow.setContent(content);//设置信息窗内容
+
+ // this.infowindow = new TMap.InfoWindow({
+ // content:content, //信息窗口内容
+ // position:new TMap.LatLng(lat,lng),//显示信息窗口的坐标
+ // map:this.map
+ // });
}
}
}
@@ -122,13 +142,8 @@ export default {
.map {
width: 100%;
height: 400px;
+
+ /* overflow: hidden; */
}
-.address-info {
- position: absolute;
- bottom: 0;
- left: 0;
- z-index: 999999;
- background: #fff;
-}
\ No newline at end of file
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 1cbf82e..25a7b21 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,7 +17,7 @@ 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;
@@ -57,11 +57,11 @@ service.interceptors.request.use(
// config.headers['Content-Type'] = 'application/json; charset=UTF-8'
// config.headers['type'] = ' admin'
}
- console.log(config)
+ // console.log(config)
return config
},
error => {
- console.log(error) // for debug
+ // console.log(error) // for debug
return Promise.reject(error)
}
)
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 4e28856..23a1d42 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -155,7 +155,7 @@
@@ -460,6 +460,7 @@
export default {
data() {
return {
+ isshowmap:true,
alllistnum: 0,
typelist: [{
name: '已租赁',
@@ -856,6 +857,7 @@
this.onaction = '4'
},
async getAll() {
+ let that = this
if (this.ontype == '1') {
const res = await getAlls({
...this.pagequery,
@@ -885,7 +887,17 @@
}
// console.error(']]]]]]]]]')
// console.error(this.tableData)
- this.$refs.mapchakannewrefs.initMap(this.tableData)
+ this.isshowmap = false
+
+ // 刷新渲染层
+ this.$nextTick(() => {
+ this.isshowmap = true
+ // 延迟渲染
+ setTimeout(() => {
+ that.$refs.mapchakannewrefs.initMap(that.tableData)
+ }, 100)
+
+ })
},
removeonaction(e) {
diff --git a/admin-web-master/src/views/liveMenu/liveRoom/index.vue b/admin-web-master/src/views/liveMenu/liveRoom/index.vue
index 895c07c..8c1a276 100644
--- a/admin-web-master/src/views/liveMenu/liveRoom/index.vue
+++ b/admin-web-master/src/views/liveMenu/liveRoom/index.vue
@@ -363,10 +363,10 @@ export default {