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

This commit is contained in:
duanxiaohai 2024-07-29 13:14:19 +08:00
commit 259ce1a608
1 changed files with 4 additions and 3 deletions

View File

@ -561,7 +561,7 @@ const addPolygonCounty = () => {
choose.value.person == "kjer" choose.value.person == "kjer"
) { ) {
console.log(5555555555555555); console.log(5555555555555555);
getDataBq(cfJd.value, ""); // getDataBq(cfJd.value, "");
getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false); getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
} else { } else {
getDatas("溪口镇", choose.value.person); getDatas("溪口镇", choose.value.person);
@ -833,6 +833,7 @@ const addCsUnChoose = () => {
map.removeOverlay(cs_qk_arr.value[index]); map.removeOverlay(cs_qk_arr.value[index]);
}); });
getDataBqs(cfJd.value, cfCs.value); getDataBqs(cfJd.value, cfCs.value);
getDataBq(cfJd.value, cfCs.value);
getDatas2(cfJd.value, choose.value.person, cfCs.value); getDatas2(cfJd.value, choose.value.person, cfCs.value);
if ( if (
choose.value.person == "cjr" || choose.value.person == "cjr" ||
@ -843,7 +844,7 @@ const addCsUnChoose = () => {
choose.value.person == "tyjr" || choose.value.person == "tyjr" ||
choose.value.person == "kjer" choose.value.person == "kjer"
) { ) {
getDataBq(cfJd.value, cfCs.value); // getDataBq(cfJd.value, cfCs.value);
getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false); getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
} }
if (choose.value.person == "") { if (choose.value.person == "") {
@ -2473,7 +2474,7 @@ const getDataBq = async (jd, cs) => {
tsbqTotal.value.push({ tsbqTotal.value.push({
id: idd, id: idd,
name: name, name: name,
rksl: res.data[name], rksl: res.data[name] || 0,
}); });
} }
} }