This commit is contained in:
汪汇 2024-07-29 13:50:21 +08:00
commit 8381487688
1 changed files with 14 additions and 10 deletions

View File

@ -525,6 +525,7 @@ const addPolygonCounty = () => {
cfJd.value = item.name; cfJd.value = item.name;
let jdCenter = []; let jdCenter = [];
if (item.name == "溪口镇") { if (item.name == "溪口镇") {
console.log(444444444, choose.value.person);
BMAP(); BMAP();
getDatas("溪口镇", ""); getDatas("溪口镇", "");
getDataBq(cfJd.value, ""); getDataBq(cfJd.value, "");
@ -538,9 +539,8 @@ const addPolygonCounty = () => {
choose.value.person == "kjer" choose.value.person == "kjer"
) { ) {
console.log(5555555555555555); console.log(5555555555555555);
// getDataBq(cfJd.value, "");
getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false); getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
} else { } else if (choose.value.person != "") {
getDatas("溪口镇", choose.value.person); getDatas("溪口镇", choose.value.person);
} }
@ -706,12 +706,10 @@ const addPolygonCountyCs = () => {
) { ) {
getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false); getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
} else { } else {
console.log(2, "溪口镇"); // console.log(2, "");
getDataBqs(cfJd.value, cfCs.value); getDataBqs(cfJd.value, cfCs.value);
// getDatas2("", choose.value.person, cfCs.value);
// getDatas2("", choose.value.person, cfCs.value);
} }
//
getDatas2(cfJd.value, choose.value.person, cfCs.value); getDatas2(cfJd.value, choose.value.person, cfCs.value);
addCsChoose(); addCsChoose();
addCsUnChoose(); addCsUnChoose();
@ -1438,7 +1436,7 @@ const changeFwq = async (id, list, center, name, names) => {
await getServiceCircle(names, name); await getServiceCircle(names, name);
choose.value.fwq = id; choose.value.fwq = id;
map.clearOverlays(); // map.clearOverlays(); //
choose.value.person = '' choose.value.person = "";
addggfwq(); // addggfwq(); //
setTimeout(() => { setTimeout(() => {
goMapCenter(center, 16); // goMapCenter(center, 16); //
@ -2222,6 +2220,9 @@ const getServiceCircle = async (communityName, townName) => {
// //
const getData = async (i, e) => { const getData = async (i, e) => {
if (e == "9999") {
e = "";
}
await http await http
.get(`/api/ggfwyth/ysyzt/getXzjdrksl?age=${e || ""}`) .get(`/api/ggfwyth/ysyzt/getXzjdrksl?age=${e || ""}`)
.then((res) => { .then((res) => {
@ -2229,7 +2230,7 @@ const getData = async (i, e) => {
if (cfJd.value == "") { if (cfJd.value == "") {
personTotal.value = [ personTotal.value = [
{ {
id: "0", id: "9999",
ages: "总人口", ages: "总人口",
age: "", age: "",
value: "res.data.total", value: "res.data.total",
@ -2278,6 +2279,9 @@ const getData = async (i, e) => {
} }
}; };
const getDatas = async (e, i) => { const getDatas = async (e, i) => {
if (i == "9999") {
i = "";
}
await http await http
.get(`/api/ggfwyth/ysyzt/getCssrksl?town=${e}&age=${i || ""}`) .get(`/api/ggfwyth/ysyzt/getCssrksl?town=${e}&age=${i || ""}`)
.then((res) => { .then((res) => {
@ -2286,7 +2290,7 @@ const getDatas = async (e, i) => {
} else if (cfJd.value !== "") { } else if (cfJd.value !== "") {
personTotal.value = [ personTotal.value = [
{ {
id: "0", id: "9999",
ages: "总人口", ages: "总人口",
age: "", age: "",
value: "res.data.total", value: "res.data.total",
@ -2399,7 +2403,7 @@ const getDatas2 = async (e, i, cs) => {
if (res.code == 200) { if (res.code == 200) {
personTotal.value = [ personTotal.value = [
{ {
id: "0", id: "9999",
ages: "总人口", ages: "总人口",
age: "", age: "",
value: "res.data.total", value: "res.data.total",