xiangshan
/
ggfwjsc
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

This commit is contained in:
duanxiaohai 2024-08-02 11:16:43 +08:00
parent 5903233680 5030a0fb6f
commit e97173cf1d
2 changed files with 111 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/view/dialog/dialogMapDp.vue
View File

@ -75,6 +75,7 @@
</el-table-column>
<el-table-column
v-else
:width="item.width"
:property="item.property"
:label="item.label"
:show-overflow-tooltip="true"

119
src/view/sy_mapcopy.vue
View File

@ -954,13 +954,13 @@ const tableType = reactive({
property: "xm",
},
{
label: "证件类型",
property: "szdw",
},
{
label: "证件号码",
property: "zy",
label: "手机号",
property: "phone",
},
// {
// label: "证件号码",
// property: "zy",
// },
{
label: "政治面貌",
property: "zzmm",
@ -980,13 +980,13 @@ const tableType = reactive({
{
label: "户口登记地",
property: "hkdjd",
width: "200px",
},
],
data: [
{
xm: "张三",
szdw: "身份证",
zy: "123456789012345678",
phone: "123456789012345678",
zzmm: "党员",
jzzt: "未居住",
mz: "汉族",
@ -1004,7 +1004,7 @@ const pagination = reactive({
//--------定义方法----------------------------------------
//地图初始化
const initMap = () => {
map = new BMapGL.Map("map", { minZoom: 11, maxZoom: 20 });
map = new BMapGL.Map("map", { minZoom: 8, maxZoom: 20 });
map.setMapType(BMAP_SATELLITE_MAP);
map.enableScrollWheelZoom(true);
goMapCenter([119.178783, 29.034583], 11);
@ -1321,6 +1321,7 @@ const getDatas = async (e, i) => {
});
};
const getDatas2 = async (e, i, cs) => {
let i1=i;
if (
i == "cjr" ||
i == "dibian" ||
@ -1400,6 +1401,16 @@ const getDatas2 = async (e, i, cs) => {
}
}
});
if (
i1 == "cjr" ||
i1 == "dibian" ||
i1 == "db" ||
i1 == "gxy" ||
i1 == "tnb" ||
i1 == "tyjr" ||
i1 == "kjer"
) {
} else {
if (choose.value.person == "") {
cs_dd_arr.value.map((item, index) => {
DGcreateCs(item, index);
@ -1409,6 +1420,7 @@ const getDatas2 = async (e, i, cs) => {
DGcreateCs2(item, index);
});
}
}
};
//特殊标签
//获取特殊标签
@ -1532,6 +1544,81 @@ const getDataBqs2 = async (jd, cs, bq, f = true) => {
}
});
};
//单点选择区域获取特殊标签
const getDataBqs3 = async (jd, cs, bq) => {
//f用来判断执不执行changeRs2
let data = {};
let vv = 0;
if (cs == "" && jd == "") {
data = {
tsbq: bq,
};
vv = 1;
} else if (cs == "") {
data = {
xzjd: jd,
tsbq: bq,
};
vv = 2;
} else {
data = {
xzjd: jd,
tsbq: bq,
csq: cs,
};
vv = 3;
}
await http.get(`/api/ggfwyth/ysyzt/getTsbqByXzjdOrCsq`, data).then((res) => {
if (res.code == 200) {
// if (cfJd.value != "") {
xkzCenter.map((item) => {
item.numbers = 0;
res.data.map((items) => {
if (items.csq == item.name) {
item.numbers = items.rs;
}
});
});
// }
// cs_name_arr.value.forEach((item, index) => {
// map.removeOverlay(cs_name_arr.value[index]);
// });
// cs_number_name_arr.value.forEach((item, index) => {
// map.removeOverlay(cs_number_name_arr.value[index]);
// });
// cs_dd_arr.value.forEach((item, index) => {
// map.removeOverlay(cs_dd_arr.value[index]);
// });
// if (title_jd.value == "") {
// } else {
// if (sfdd.value) {
cs_dd_arr.value = [...xuanzhongCs.value];
if (choose.value.person == "") {
// cs_dd_arr.value.forEach((item, index) => {
// map.removeOverlay(cs_dd_arr.value[index]);
// });
cs_dd_arr.value.map((item, index) => {
DGcreateCs(item, index);
});
} else {
// cs_dd_arr.value = [...xuanzhongCs.value];
console.log(cs_dd_arr.value);
cs_dd_arr.value.map((item, index) => {
DGcreateCs2(item, index);
});
}
// }
// else {
// if (choose.value.person == "") {
// addCs();
// } else {
// addCs2();
// }
// }
// }
}
});
};
//特殊标签单独获取各个街道人数
const getDataBqJD = async (bq) => {
let data = {};
@ -2183,7 +2270,7 @@ const addPolygonCountyCs = () => {
map.addOverlay(cs_qk_arr.value[index]);
cs_qk_arr.value[index].addEventListener("click", () => {
// console.log("名字", item.name);
cs_dd_arr.value = [];
cfCs.value = item.name;
title_cs.value = item.name;
sfdd.value = true;
@ -2221,7 +2308,7 @@ const addPolygonCountyCs = () => {
choose.value.person == "tyjr" ||
choose.value.person == "kjer"
) {
getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
getDataBqs3(cfJd.value, cfCs.value, choose.value.person);
} else {
// getDataBqs(cfJd.value, cfCs.value);
}
@ -2314,9 +2401,9 @@ const addCsUnChoose = () => {
unChooseList.value.push(itemm);
}
});
cs_un_choose_arr.value.forEach((item, index) => {
map.removeOverlay(cs_qk_arr.value[index]);
});
// cs_un_choose_arr.value.forEach((item, index) => {
// map.removeOverlay(cs_qk_arr.value[index]);
// });
// getDataBqs(cfJd.value, cfCs.value);
getDataBq(cfJd.value, cfCs.value);
getDatas2(cfJd.value, choose.value.person, cfCs.value);
@ -2345,7 +2432,7 @@ const addCsUnChoose = () => {
choose.value.person == "tyjr" ||
choose.value.person == "kjer"
) {
getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
getDataBqs3(cfJd.value, cfCs.value, choose.value.person);
}
// if (choose.value.person == "") {
// cs_dd_arr.value.map((item, index) => {
@ -2665,7 +2752,7 @@ const reset_font = () => {
}
};
onMounted(() => {
// tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
reset_font();
initMap();
getData();