diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index 6e4327c..9c033da 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -525,6 +525,7 @@ const addPolygonCounty = () => { cfJd.value = item.name; let jdCenter = []; if (item.name == "溪口镇") { + console.log(444444444, choose.value.person); BMAP(); getDatas("溪口镇", ""); getDataBq(cfJd.value, ""); @@ -538,9 +539,8 @@ const addPolygonCounty = () => { choose.value.person == "kjer" ) { console.log(5555555555555555); - // getDataBq(cfJd.value, ""); getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false); - } else { + } else if (choose.value.person != "") { getDatas("溪口镇", choose.value.person); } @@ -706,12 +706,10 @@ const addPolygonCountyCs = () => { ) { getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false); } else { - console.log(2, "溪口镇"); + // console.log(2, "溪口镇"); 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); addCsChoose(); addCsUnChoose(); @@ -1438,7 +1436,7 @@ const changeFwq = async (id, list, center, name, names) => { await getServiceCircle(names, name); choose.value.fwq = id; map.clearOverlays(); //清空地图上所有的覆盖物 - choose.value.person = '' + choose.value.person = ""; addggfwq(); //创建公共服务圈 setTimeout(() => { goMapCenter(center, 16); //中心点缩放 @@ -2222,6 +2220,9 @@ const getServiceCircle = async (communityName, townName) => { //获取人口数 const getData = async (i, e) => { + if (e == "9999") { + e = ""; + } await http .get(`/api/ggfwyth/ysyzt/getXzjdrksl?age=${e || ""}`) .then((res) => { @@ -2229,7 +2230,7 @@ const getData = async (i, e) => { if (cfJd.value == "") { personTotal.value = [ { - id: "0", + id: "9999", ages: "总人口", age: "", value: "res.data.total", @@ -2278,6 +2279,9 @@ const getData = async (i, e) => { } }; const getDatas = async (e, i) => { + if (i == "9999") { + i = ""; + } await http .get(`/api/ggfwyth/ysyzt/getCssrksl?town=${e}&age=${i || ""}`) .then((res) => { @@ -2286,7 +2290,7 @@ const getDatas = async (e, i) => { } else if (cfJd.value !== "") { personTotal.value = [ { - id: "0", + id: "9999", ages: "总人口", age: "", value: "res.data.total", @@ -2399,7 +2403,7 @@ const getDatas2 = async (e, i, cs) => { if (res.code == 200) { personTotal.value = [ { - id: "0", + id: "9999", ages: "总人口", age: "", value: "res.data.total",