diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index 01f11cb..0000000
Binary files a/dist.zip and /dev/null differ
diff --git a/src/assets/guide/Dp/1.png b/src/assets/guide/Dp/1.png
index a84a730..e7bd7fb 100644
Binary files a/src/assets/guide/Dp/1.png and b/src/assets/guide/Dp/1.png differ
diff --git a/src/assets/guide/Dp/2.png b/src/assets/guide/Dp/2.png
index 7567aae..8953db8 100644
Binary files a/src/assets/guide/Dp/2.png and b/src/assets/guide/Dp/2.png differ
diff --git a/src/assets/guide/Dp/3.png b/src/assets/guide/Dp/3.png
index aeb8c89..af44c9d 100644
Binary files a/src/assets/guide/Dp/3.png and b/src/assets/guide/Dp/3.png differ
diff --git a/src/assets/guide/Dp/4.png b/src/assets/guide/Dp/4.png
index 5c15207..8a4a90e 100644
Binary files a/src/assets/guide/Dp/4.png and b/src/assets/guide/Dp/4.png differ
diff --git a/src/assets/guide/Dp/5.png b/src/assets/guide/Dp/5.png
index 7193d2c..a845e94 100644
Binary files a/src/assets/guide/Dp/5.png and b/src/assets/guide/Dp/5.png differ
diff --git a/src/assets/guide/Dp/6.png b/src/assets/guide/Dp/6.png
index 0a9e0bf..ad2fbc4 100644
Binary files a/src/assets/guide/Dp/6.png and b/src/assets/guide/Dp/6.png differ
diff --git a/src/assets/guide/Dp/7.png b/src/assets/guide/Dp/7.png
new file mode 100644
index 0000000..afac429
Binary files /dev/null and b/src/assets/guide/Dp/7.png differ
diff --git a/src/assets/guide/Dp/8.png b/src/assets/guide/Dp/8.png
new file mode 100644
index 0000000..4d31252
Binary files /dev/null and b/src/assets/guide/Dp/8.png differ
diff --git a/src/view/guide.vue b/src/view/guide.vue
index 579f44d..0adc42d 100644
--- a/src/view/guide.vue
+++ b/src/view/guide.vue
@@ -29,7 +29,7 @@
:style="{
transform: `rotateY(${45 * indexP}deg) translateZ(450px)`,
}"
- @click="toPage(itemP.url)"
+ @click.stop="toPage(itemP.url)"
>
@@ -76,6 +76,8 @@ import png3 from "@/assets/guide/Dp/3.png";
import png4 from "@/assets/guide/Dp/4.png";
import png5 from "@/assets/guide/Dp/5.png";
import png6 from "@/assets/guide/Dp/6.png";
+import png7 from "@/assets/guide/Dp/7.png";
+import png8 from "@/assets/guide/Dp/8.png";
const router = useRouter();
const routers = useRoute();
@@ -184,31 +186,31 @@ const tabData = reactive({
url: "/home/index/table",
},
{
- img: png1,
+ img: png2,
url: "/home/index/map",
},
{
- img: png1,
+ img: png3,
url: "/home/index",
},
{
- img: png2,
+ img: png4,
url: "/home/yl",
},
{
- img: png3,
+ img: png5,
url: "/home/hygiene",
},
{
- img: png4,
+ img: png6,
url: "/home/education",
},
{
- img: png5,
+ img: png7,
url: "/home/work",
},
{
- img: png6,
+ img: png8,
url: "/home/analyze",
},
],
@@ -226,7 +228,7 @@ const changeTab = (val) => {
};
const toPage = (val) => {
- // console.log(val);
+ console.log(val);
router.push({
path: `${val}`,
});
diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index 7d215eb..6d9c71c 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -391,6 +391,7 @@ const xkzCenter = reactive([
var map = null;
// 鼠标点击添加点位
let currentMarker = null; // 用于保存当前标记的引用
+<<<<<<< HEAD
const BMAP = (name) => {
// console.log(name, 666);
// 添加鼠标点击事件监听器
@@ -421,7 +422,26 @@ const BMAP = (name) => {
map.addOverlay(marker.value);
currentMarker = marker.value;
// addCs();
+=======
+const markera = (e) => {
+ // console.log(`${e.latlng.lng},${e.latlng.lat} `, "name");
+ // 检查并移除当前标记
+ if (currentMarker !== null) {
+ map.removeOverlay(currentMarker);
+ }
+ // 创建新标记
+ let 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,
+>>>>>>> 5f87d337a21a3b331619d0bbf01cb87ac10df9cc
});
+ // 将新标记添加到地图中并更新当前标记引用
+ map.addOverlay(marker);
+ currentMarker = marker;
+};
+const BMAP = () => {
+ // 添加鼠标点击事件监听器
+ map.addEventListener("click", markera);
};
const initMap = () => {
@@ -435,7 +455,6 @@ const initMap = () => {
//渲染地块
addPolygonCounty();
//添加街道名
- // BMAP();
addJd();
};
const loadTown = () => {
@@ -499,8 +518,12 @@ const addPolygonCounty = () => {
cfjiedao.value = item.name;
let jdCenter = [];
if (item.name == "溪口镇") {
+<<<<<<< HEAD
cfJd.value = item.name;
getDatas2("溪口镇", choose.value.person);
+=======
+ BMAP();
+>>>>>>> 5f87d337a21a3b331619d0bbf01cb87ac10df9cc
if (!title_choose.value.includes("溪口镇")) {
title_choose.value = title_choose.value + `>${item.name}`;
}
@@ -520,6 +543,10 @@ const addPolygonCounty = () => {
console.log("dbfjdsbfjds", choose.value.person);
goMapCenter(jdCenter, 13);
} else {
+ map.removeEventListener("click", markera);
+ if (currentMarker !== null) {
+ map.removeOverlay(currentMarker);
+ }
// xuanzhongCs.value = [];
// sfdd.value = false;
// title_choose.value = "";
@@ -698,7 +725,10 @@ const addCsChoose = () => {
chooseCsList.value.map((item, index) => {
console.log("item11", item.name);
sqname.value = item.name;
+<<<<<<< HEAD
// BMAP(item.name);
+=======
+>>>>>>> 5f87d337a21a3b331619d0bbf01cb87ac10df9cc
let fillColor = "blue";
//地区的坐标范围
let points = [];
@@ -2232,6 +2262,7 @@ onMounted(() => {
BMAP();
});
+