This commit is contained in:
闫世杰 2025-01-15 08:44:41 +08:00
parent e5c2f0ab52
commit 84eef74812
1 changed files with 13 additions and 4 deletions

View File

@ -1149,6 +1149,7 @@ const yaosuTotal = ref([
id: 38, id: 38,
name: "共享教师", name: "共享教师",
url: "/api/ggfwyth/ysyzt/getGxjsXx", url: "/api/ggfwyth/ysyzt/getGxjsXx",
tooltip: "xxmc",
img: gxjs, img: gxjs,
wz: true, wz: true,
click: true, click: true,
@ -1157,6 +1158,7 @@ const yaosuTotal = ref([
id: 39, id: 39,
name: "共享食堂", name: "共享食堂",
url: "/api/ggfwyth/ysyzt/getLnstxx", url: "/api/ggfwyth/ysyzt/getLnstxx",
tooltip: "lnstmc",
img: gxst, img: gxst,
wz: true, wz: true,
click: true, click: true,
@ -1313,7 +1315,7 @@ const yaosuTotal = ref([
name: "停车场", name: "停车场",
img: tcc, img: tcc,
wz: true, wz: true,
click: true, click: false,
}, },
{ {
id: 23, id: 23,
@ -3516,7 +3518,14 @@ const getZyys = (url, name, img, img_map, tooltip, img_width) => {
yaosuIcon.value[name] = {}; yaosuIcon.value[name] = {};
yaosuIcon.value[name]["sj"] = []; yaosuIcon.value[name]["sj"] = [];
if (name == "共享食堂") { if (name == "共享食堂") {
yaosuIcon.value[name]["sj"] = [...res.data.lnst, ...res.data.zcd]; let zcd =
res.data.zcd.map((item) => {
return {
...item,
lnstmc: item.zcdmc,
};
}) || [];
yaosuIcon.value[name]["sj"] = [...res.data.lnst, ...zcd];
} else { } else {
yaosuIcon.value[name]["sj"] = res.data; yaosuIcon.value[name]["sj"] = res.data;
} }
@ -3759,7 +3768,7 @@ const createZyys = (polygon, indexx, name, tooltip, img_width) => {
map.removeOverlay(item); // map.removeOverlay(item); //
}); });
} }
if (polygon.fgfwrs.length == 0) { if (!polygon?.fgfwrs) {
ElMessage.warning({ ElMessage.warning({
message: "暂无数据", message: "暂无数据",
}); });
@ -3896,7 +3905,7 @@ const loadCs_zyys2 = async (jdname, name) => {
} }
} }
}; };
const get_dk_zyys = async (sj, xd, ssly, name) => { const get_dk_zyys = async (sj = [], xd, ssly, name) => {
zyys_dk.value = []; zyys_dk.value = [];
zyys_center.value = []; zyys_center.value = [];
zyys_data.value.point = []; zyys_data.value.point = [];