diff --git a/src/assets/images/map/AED.png b/src/assets/images/map/AED.png new file mode 100644 index 0000000..f4a5f22 Binary files /dev/null and b/src/assets/images/map/AED.png differ diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index 3e0f6db..4d5ed3d 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -421,6 +421,7 @@ const change = (name, index) => { .module { width: 100%; height: 943px; + margin-top: 112px; display: flex; justify-content: space-between; padding: 10px 45px; diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index 86012b6..cf14af7 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -107,7 +107,7 @@ import b5 from "@/assets/images/map/b5.png"; import b6 from "@/assets/images/map/b6.png"; import xcbg from "@/assets/images/map/xcbg.png"; import http from "@/utils/request.js"; - +import AED from "@/assets/images/map/AED.png"; //删除 const jdm_arr = ref([]); const jdm_number_arr = ref([]); @@ -116,6 +116,7 @@ const cs_qk_arr = ref([]); const cs_name_arr = ref([]); const cs_number_name_arr = ref([]); // +const jrcs=ref(false) const title_choose = ref("龙游县"); //村社颜色列表 const colorList = [ @@ -147,6 +148,8 @@ const colorList = [ bg: "RGBA(27, 91, 55, 1)", }, ]; +//选中社区 + //中心点坐标 const center_now = ref([]); const center_center = ref([119.178783, 29.034583]); @@ -313,16 +316,18 @@ const xkzCenter = reactive([ }, ]); var map = null; - +// 鼠标点击添加点位 const BMAP = () => { // 添加鼠标点击事件监听器 map.addEventListener("click", function (e) { - console.log(e.point, 666); - // console.log(e.point.latLng.lng,e.point.latLng.lat, 666); - // var pt = e.point; // 获取点击的坐标 - map.addOverlay(marker); - var marker = new BMapGL.Marker(new BMapGL.Point(e.point.lng, e.point.lat)); // 创建点 - // var marker = new BMapGL.Marker(pt); // 创建标注 + let icons = ""; + icons = new BMapGL.Icon(AED, new BMapGL.Size(24, 62)); + var marker = new BMapGL.Marker( + new BMapGL.Point(e.latlng.lng, e.latlng.lat), + { + icon: icons, + } + ); // 创建点 map.addOverlay(marker); // 将标注添加到地图中 }); }; @@ -338,8 +343,8 @@ const initMap = () => { //渲染地块 addPolygonCounty(); //添加街道名 - addJd(); BMAP(); + addJd(); }; const loadTown = () => { for (let v of mapTown.features) { @@ -384,8 +389,16 @@ const addPolygonCounty = () => { map.addOverlay(polygon); polygon.addEventListener("click", () => { console.log(item.name); - if (title_choose.value.includes("溪口镇")) { + if(item.name !== "溪口镇"){ + jrcs.value=false; + console.log( jrcs.value,'000'); + } + if (jrcs.value && item.name !== "溪口镇") { + console.log(1); } else { + console.log(2); + + jrcs.value=true; let jdCenter = []; if (item.name == "溪口镇") { if (!title_choose.value.includes("溪口镇")) { @@ -398,6 +411,7 @@ const addPolygonCounty = () => { jdCenter = item.center; } }); + console.log( jrcs.value); addCs(); goMapCenter(jdCenter, 13); } else { @@ -474,7 +488,13 @@ const addPolygonCountyCs = () => { }); map.addOverlay(cs_qk_arr.value[index]); cs_qk_arr.value[index].addEventListener("click", () => { - console.log(111); + console.log(item.name); + // console.log(111,xkzDk); + // xkzDk.forEach((itemm,indexx)=>{ + // if(itemm.name==item.name){ + + // } + // }) // let jdCenter = []; // if (item.name == "溪口镇") { // if (!title_choose.value.includes("溪口镇")) { @@ -502,6 +522,7 @@ const addPolygonCountyCs = () => { } }); }; + // 添加地图上的街道名 const createCustomOverlayJd = (polygon, indexx) => { diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue index d1ca2c8..c4d2573 100644 --- a/src/view/sy_table.vue +++ b/src/view/sy_table.vue @@ -440,6 +440,7 @@ const rowState = (row) => { img { width: 24px; height: 24px; + margin-right: 8px; } .tableli { font-size: 26px; @@ -451,7 +452,7 @@ const rowState = (row) => { height: 29px; background: rgba(255, 255, 255, 0.2); border-radius: 15px; - border: 0px solid #ffffff; + border: 1px solid #ffffff6b; color: #ffffff; font-weight: 400;