Compare commits
No commits in common. "72526bec333ba6851fbd13922fb50da0712caf81" and "2585de002d83d3ee1a7805781c9dff74be5efc25" have entirely different histories.
72526bec33
...
2585de002d
|
|
@ -232,10 +232,7 @@ import xcbg from "@/assets/images/map/xcbg.png";
|
|||
import AED from "@/assets/images/map/AED.png";
|
||||
import Dialog from "./dialog/dialogMapDp.vue";
|
||||
import personDetail from "./person/index.vue";
|
||||
import { ElLoading } from "element-plus";
|
||||
//--------定义参数-------
|
||||
//加载
|
||||
var loading;
|
||||
//是否打开人物详情
|
||||
const openD = ref(true);
|
||||
const message = ref({});
|
||||
|
|
@ -961,14 +958,8 @@ const buten = async (item) => {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
loading = ElLoading.service({
|
||||
lock: true,
|
||||
text: "加载中...",
|
||||
background: "rgba(0, 0, 0, 0)",
|
||||
});
|
||||
await getData(item.age);
|
||||
await getDatas(cfJd.value, item.age);
|
||||
loading.close();
|
||||
getData(item.age);
|
||||
getDatas(cfJd.value, item.age);
|
||||
}
|
||||
};
|
||||
//点击特殊标签(关键字存name)
|
||||
|
|
@ -1005,11 +996,6 @@ const buten2 = async (item) => {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
loading = ElLoading.service({
|
||||
lock: true,
|
||||
text: "加载中...",
|
||||
background: "rgba(0, 0, 0, 0)",
|
||||
});
|
||||
getDataBqs(cfJd.value, cfCs.value, item.id);
|
||||
}
|
||||
};
|
||||
|
|
@ -1434,8 +1420,7 @@ const getDataBq = async (jd, cs) => {
|
|||
};
|
||||
const getDataBqs = async (jd, cs, bq) => {
|
||||
await getDataBqJD(bq);
|
||||
await getDataBqs2(cfJd.value, cfCs.value, bq);
|
||||
loading.close();
|
||||
getDataBqs2(cfJd.value, cfCs.value, bq);
|
||||
};
|
||||
//特殊标签获取街道内部人数
|
||||
const getDataBqs2 = async (jd, cs, bq) => {
|
||||
|
|
@ -2284,31 +2269,21 @@ const addPolygonCounty = () => {
|
|||
});
|
||||
|
||||
map.addOverlay(polygon);
|
||||
polygon.addEventListener("click", async () => {
|
||||
polygon.addEventListener("click", () => {
|
||||
// townName.value = item.name;
|
||||
if (item.name == cfJd.value) {
|
||||
} else {
|
||||
loading = ElLoading.service({
|
||||
lock: true,
|
||||
text: "加载中...",
|
||||
background: "rgba(0, 0, 0, 0)",
|
||||
});
|
||||
clear();
|
||||
xkzDk.length = 0;
|
||||
cfJd.value = item.name;
|
||||
let jdCenter = [];
|
||||
// if (item.name == "溪口镇") {
|
||||
BMAP();
|
||||
loadCs(item.name);
|
||||
addPolygonCountyCs();
|
||||
mapTownCount.map((itemm) => {
|
||||
if (itemm.name == item.name) {
|
||||
jdCenter = itemm.center;
|
||||
}
|
||||
});
|
||||
goMapCenter(jdCenter, 13);
|
||||
await getDataBq(cfJd.value, "");
|
||||
getDataBq(cfJd.value, "");
|
||||
if (choose.value.person == "") {
|
||||
await getDatas(cfJd.value, "");
|
||||
getDatas(cfJd.value, "");
|
||||
}
|
||||
if (
|
||||
choose.value.person == "残疾人" ||
|
||||
|
|
@ -2321,13 +2296,13 @@ const addPolygonCounty = () => {
|
|||
choose.value.person == "孤儿" ||
|
||||
choose.value.person == "特困"
|
||||
) {
|
||||
getDataBqs2(cfJd.value, cfCs.value, choose.value.person);
|
||||
getDatas(cfJd.value, "", false);
|
||||
getDataBqs2(cfJd.value, cfCs.value, choose.value.person);
|
||||
getDatas(cfJd.value, "", false);
|
||||
} else if (choose.value.person != "") {
|
||||
if (choose.value.person == "9999") {
|
||||
await getDatas(cfJd.value, "");
|
||||
getDatas(cfJd.value, "");
|
||||
} else {
|
||||
await getDatas(cfJd.value, choose.value.person);
|
||||
getDatas(cfJd.value, choose.value.person);
|
||||
}
|
||||
}
|
||||
if (title_jd.value == item.name) {
|
||||
|
|
@ -2335,7 +2310,24 @@ const addPolygonCounty = () => {
|
|||
title_jd.value = item.name;
|
||||
}
|
||||
|
||||
loading.close();
|
||||
mapTownCount.map((itemm) => {
|
||||
if (itemm.name == item.name) {
|
||||
jdCenter = itemm.center;
|
||||
}
|
||||
});
|
||||
goMapCenter(jdCenter, 13);
|
||||
// }
|
||||
// else {
|
||||
// loadCs(item.name);
|
||||
// addPolygonCountyCs();
|
||||
// // map.removeEventListener("click", markera);
|
||||
// // if (currentMarker !== null) {
|
||||
// // map.removeOverlay(currentMarker);
|
||||
// // }
|
||||
// // clear();
|
||||
// // getData();
|
||||
// // getDataBq();
|
||||
// }
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -2538,12 +2530,8 @@ const addPolygonCountyCs = () => {
|
|||
zIndex: 99,
|
||||
});
|
||||
map.addOverlay(cs_qk_arr.value[index]);
|
||||
cs_qk_arr.value[index].addEventListener("click", async () => {
|
||||
loading = ElLoading.service({
|
||||
lock: true,
|
||||
text: "数据加载中...",
|
||||
background: "rgba(0, 0, 0, 0)",
|
||||
});
|
||||
cs_qk_arr.value[index].addEventListener("click", () => {
|
||||
// console.log("名字", item.name);
|
||||
cs_dd_arr.value = [];
|
||||
cfCs.value = item.name;
|
||||
title_cs.value = item.name;
|
||||
|
|
@ -2563,8 +2551,6 @@ const addPolygonCountyCs = () => {
|
|||
unChooseList.value.push(itemm);
|
||||
}
|
||||
});
|
||||
addCsChoose();
|
||||
addCsUnChoose();
|
||||
cs_qk_arr.value.forEach((item, index) => {
|
||||
map.removeOverlay(cs_qk_arr.value[index]);
|
||||
});
|
||||
|
|
@ -2574,7 +2560,7 @@ const addPolygonCountyCs = () => {
|
|||
cs_number_name_arr.value.forEach((item, index) => {
|
||||
map.removeOverlay(cs_number_name_arr.value[index]);
|
||||
});
|
||||
await getDataBq(cfJd.value, cfCs.value);
|
||||
getDataBq(cfJd.value, cfCs.value);
|
||||
if (
|
||||
choose.value.person == "残疾人" ||
|
||||
choose.value.person == "低边" ||
|
||||
|
|
@ -2586,13 +2572,29 @@ const addPolygonCountyCs = () => {
|
|||
choose.value.person == "孤儿" ||
|
||||
choose.value.person == "特困"
|
||||
) {
|
||||
await getDataBqs3(cfJd.value, cfCs.value, choose.value.person);
|
||||
getDataBqs3(cfJd.value, cfCs.value, choose.value.person);
|
||||
} else {
|
||||
// getDataBqs(cfJd.value, cfCs.value);
|
||||
}
|
||||
|
||||
await getDatas2(cfJd.value, choose.value.person, cfCs.value);
|
||||
|
||||
loading.close();
|
||||
//这段注意
|
||||
// if (choose.value.person == 1) {
|
||||
// getDatas2(cfJd.value, "0", cfCs.value); //0岁传字符串
|
||||
// } else {
|
||||
// getDatas2(cfJd.value, choose.value.person - 1, cfCs.value);
|
||||
// }
|
||||
getDatas2(cfJd.value, choose.value.person, cfCs.value);
|
||||
// getDatas2(cfJd.value, choose.value.person, cfCs.value);
|
||||
addCsChoose();
|
||||
addCsUnChoose();
|
||||
// if (choose.value.person == "") {
|
||||
// cs_dd_arr.value.map((item, index) => {
|
||||
// DGcreateCs(item, index);
|
||||
// });
|
||||
// } else {
|
||||
// cs_dd_arr.value.map((item, index) => {
|
||||
// DGcreateCs2(item, index);
|
||||
// });
|
||||
// }
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -2639,12 +2641,7 @@ const addCsUnChoose = () => {
|
|||
zIndex: 99,
|
||||
});
|
||||
map.addOverlay(cs_un_choose_arr.value[index]);
|
||||
cs_un_choose_arr.value[index].addEventListener("click", async () => {
|
||||
loading = ElLoading.service({
|
||||
lock: true,
|
||||
text: "数据加载中...",
|
||||
background: "rgba(0, 0, 0, 0)",
|
||||
});
|
||||
cs_un_choose_arr.value[index].addEventListener("click", () => {
|
||||
cfCs.value = item.name;
|
||||
title_cs.value = cfCs.value;
|
||||
sfdd.value = true;
|
||||
|
|
@ -2674,10 +2671,11 @@ const addCsUnChoose = () => {
|
|||
unChooseList.value.push(itemm);
|
||||
}
|
||||
});
|
||||
addCsChoose();
|
||||
addCsUnChoose();
|
||||
await getDataBq(cfJd.value, cfCs.value);
|
||||
await getDatas2(cfJd.value, choose.value.person, cfCs.value);
|
||||
|
||||
getDataBq(cfJd.value, cfCs.value);
|
||||
|
||||
getDatas2(cfJd.value, choose.value.person, cfCs.value);
|
||||
|
||||
if (
|
||||
choose.value.person == "残疾人" ||
|
||||
choose.value.person == "低边" ||
|
||||
|
|
@ -2689,9 +2687,11 @@ const addCsUnChoose = () => {
|
|||
choose.value.person == "孤儿" ||
|
||||
choose.value.person == "特困"
|
||||
) {
|
||||
await getDataBqs3(cfJd.value, cfCs.value, choose.value.person);
|
||||
getDataBqs3(cfJd.value, cfCs.value, choose.value.person);
|
||||
}
|
||||
loading.close();
|
||||
|
||||
addCsChoose();
|
||||
addCsUnChoose();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue