Merge branch 'main' of git.zdool.com:xs/ggfwjsc

This commit is contained in:
duanxiaohai 2024-07-25 09:02:21 +08:00
commit 0e2ff4d678
1 changed files with 18 additions and 33 deletions

View File

@ -587,15 +587,15 @@ const addJd = () => {
};
//2
const addJd2 = () => {
if (center_now.value[0] == 119.178783) {
goMapCenter([119.178783, 29.034581], 11);
}
// if (center_now.value[0] == 119.178783) {
// goMapCenter([119.178783, 29.034581], 11);
// }
mapTownCount.map((item, index) => {
createCustomOverlayJd2(item, index);
});
if (center_now.value[0] == 119.178783) {
goMapCenter([119.178783, 29.034581], 11);
}
// if (center_now.value[0] == 119.178783) {
// goMapCenter([119.178783, 29.034581], 11);
// }
};
//
const loadCs = () => {
@ -872,7 +872,8 @@ const createCustomOverlayJd2 = (polygon, indexx) => {
var number = document.createElement("div");
number.style.fontSize = "9px";
number.style.fontWeight = "600";
number.style.color = "rgba(0, 255, 189, 1)";
number.style.color = "#FEFF6C";
number.style.textShadow='0px 2px 4px rgba(0,0,0,0.5)';
div.appendChild(number);
number.appendChild(document.createTextNode(this.properties.number));
content.appendChild(div);
@ -1247,28 +1248,7 @@ const removeAllPolygon = (e) => {
//
//
const chooseArr = ref([]);
const xuanran = () => {
addPolygonCounty();
if (chooseArr.value.includes("person")) {
addJd2();
if (chooseArr.value.includes("jd_noNumber")) {
addPolygonCountyCs();
addCs2();
chooseArr.value = chooseArr.value.filter(
(item) => item !== "jd_noNumber"
);
chooseArr.value.push("jd_number");
}
} else {
addJd();
}
if (chooseArr.value.includes("fwq")) {
addggfwq();
}
// if (!chooseArr.value.includes("person")) {
// addJd();
// }
};
const choose = ref({
person: "",
bq: 9999,
@ -1277,6 +1257,7 @@ const choose = ref({
});
const changeRs = (id) => {
if (choose.value.person == id) {
console.log('重复');
// chooseArr.value = chooseArr.value.filter((item) => item !== "person");
choose.value.person = "";
jdm_number_arr.value.forEach((item, index) => {
@ -1307,10 +1288,14 @@ const changeRs = (id) => {
// chooseArr.value.push("jd_noNumber");
// }
// chooseArr.value.push("person");
console.log("new");
choose.value.person = id;
choose.value.bq = 9999;
jdm_arr.value.forEach((item, index) => {
map.removeOverlay(jdm_arr.value[index]);
});
jdm_number_arr.value.forEach((item, index) => {
map.removeOverlay(jdm_number_arr.value[index]);
});
// if (cs_name_arr.value?.length) {
// cs_name_arr.value.forEach((item, index) => {
@ -1325,9 +1310,9 @@ const changeRs = (id) => {
// });
// jdm_number_arr.value.length = 0;
// }
jdm_arr.value.forEach((item, index) => {
map.removeOverlay(jdm_arr.value[index]);
});
// jdm_arr.value.forEach((item, index) => {
// map.removeOverlay(jdm_arr.value[index]);
// });
addJd2();
// removeAllPolygon("person");
// xuanran();
@ -2357,7 +2342,7 @@ onMounted(() => {
position: absolute;
width: 3px;
height: 3px;
background: #ffe229;
background: rgb(255, 226, 41);
border: 3px solid rgba(255, 226, 41, 0.31);
border-radius: 6px;
top: 7.5px;