This commit is contained in:
姚宇浩 2024-08-14 09:24:00 +08:00
parent 0c99f5c095
commit fa5def7c0f
1 changed files with 7 additions and 14 deletions

View File

@ -169,8 +169,7 @@
<div v-else>未居住</div> <div v-else>未居住</div>
</template> </template>
<template #sxt="{ currentCol, currentData }"> <template #sxt="{ currentCol, currentData }">
<el-icon size="24" color="#fff" <el-icon size="24" color="#fff" v-if="currentData.camera"
v-if="currentData.camera"
><VideoCamera ><VideoCamera
/></el-icon> /></el-icon>
</template> </template>
@ -1424,7 +1423,7 @@ const getDataBqs = async (jd, cs, bq) => {
getDataBqs2(cfJd.value, cfCs.value, bq); getDataBqs2(cfJd.value, cfCs.value, bq);
}; };
// //
const getDataBqs2 = async (jd, cs, bq, f = true) => { const getDataBqs2 = async (jd, cs, bq) => {
//fchangeRs2 //fchangeRs2
let data = {}; let data = {};
let vv = 0; let vv = 0;
@ -1468,10 +1467,6 @@ const getDataBqs2 = async (jd, cs, bq, f = true) => {
}); });
} }
if (f) {
changeRs2(bq);
}
cs_name_arr.value.forEach((item, index) => { cs_name_arr.value.forEach((item, index) => {
map.removeOverlay(cs_name_arr.value[index]); map.removeOverlay(cs_name_arr.value[index]);
}); });
@ -1573,8 +1568,6 @@ const getDataBqs3 = async (jd, cs, bq) => {
// //
const getDataBqJD = async (bq) => { const getDataBqJD = async (bq) => {
let data = {}; let data = {};
console.log(tsbq_id_total.value);
tsbq_id_total.value.forEach((item, index) => { tsbq_id_total.value.forEach((item, index) => {
if (bq == item.name) { if (bq == item.name) {
data = { data = {
@ -1596,6 +1589,7 @@ const getDataBqJD = async (bq) => {
}); });
}); });
} }
changeRs2(bq);
} }
}); });
}; };
@ -1653,10 +1647,9 @@ const changeys = (name) => {
img = item.img; img = item.img;
} }
}); });
if(name=='摄像头'){ if (name == "摄像头") {
getZyys(url, name, img); getZyys(url, name, img);
} }
} }
}; };
const getZyys = (url, name, img) => { const getZyys = (url, name, img) => {
@ -1741,7 +1734,7 @@ const to_jd = (item_name) => {
choose.value.person == "孤儿" || choose.value.person == "孤儿" ||
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); getDatas(cfJd.value, "", false);
} else if (choose.value.person != "") { } else if (choose.value.person != "") {
if (choose.value.person == "9999") { if (choose.value.person == "9999") {
@ -2303,7 +2296,7 @@ const addPolygonCounty = () => {
choose.value.person == "孤儿" || choose.value.person == "孤儿" ||
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); getDatas(cfJd.value, "", false);
} else if (choose.value.person != "") { } else if (choose.value.person != "") {
if (choose.value.person == "9999") { if (choose.value.person == "9999") {