Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc
This commit is contained in:
commit
2585de002d
|
@ -1423,7 +1423,7 @@ const getDataBqs = async (jd, cs, bq) => {
|
|||
getDataBqs2(cfJd.value, cfCs.value, bq);
|
||||
};
|
||||
//特殊标签获取街道内部人数
|
||||
const getDataBqs2 = async (jd, cs, bq, f = true) => {
|
||||
const getDataBqs2 = async (jd, cs, bq) => {
|
||||
//f用来判断执不执行changeRs2
|
||||
let data = {};
|
||||
let vv = 0;
|
||||
|
@ -1467,10 +1467,6 @@ const getDataBqs2 = async (jd, cs, bq, f = true) => {
|
|||
});
|
||||
}
|
||||
|
||||
if (f) {
|
||||
changeRs2(bq);
|
||||
}
|
||||
|
||||
cs_name_arr.value.forEach((item, index) => {
|
||||
map.removeOverlay(cs_name_arr.value[index]);
|
||||
});
|
||||
|
@ -1572,8 +1568,6 @@ const getDataBqs3 = async (jd, cs, bq) => {
|
|||
//特殊标签单独获取各个街道人数
|
||||
const getDataBqJD = async (bq) => {
|
||||
let data = {};
|
||||
console.log(tsbq_id_total.value);
|
||||
|
||||
tsbq_id_total.value.forEach((item, index) => {
|
||||
if (bq == item.name) {
|
||||
data = {
|
||||
|
@ -1595,6 +1589,7 @@ const getDataBqJD = async (bq) => {
|
|||
});
|
||||
});
|
||||
}
|
||||
changeRs2(bq);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
@ -1739,7 +1734,7 @@ const to_jd = (item_name) => {
|
|||
choose.value.person == "孤儿" ||
|
||||
choose.value.person == "特困"
|
||||
) {
|
||||
getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
|
||||
getDataBqs2(cfJd.value, cfCs.value, choose.value.person);
|
||||
getDatas(cfJd.value, "", false);
|
||||
} else if (choose.value.person != "") {
|
||||
if (choose.value.person == "9999") {
|
||||
|
@ -2301,7 +2296,7 @@ const addPolygonCounty = () => {
|
|||
choose.value.person == "孤儿" ||
|
||||
choose.value.person == "特困"
|
||||
) {
|
||||
getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
|
||||
getDataBqs2(cfJd.value, cfCs.value, choose.value.person);
|
||||
getDatas(cfJd.value, "", false);
|
||||
} else if (choose.value.person != "") {
|
||||
if (choose.value.person == "9999") {
|
||||
|
|
Loading…
Reference in New Issue