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-10-18 17:21:34 +08:00
parent f8516040b8 ac2f915c9f
commit fef25d4fdf
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/view/sy_map.vue
View File

@ -264,7 +264,7 @@
/> />
</template> </template>
<template #zxs="{ currentCol, currentData }"> <template #zxs="{ currentCol, currentData }">
<div style="width: 10px; height: 10px" v-if="currentData.zxs">*</div> <div v-if="currentData.zt>0" style="font-size: 30px;">*</div>
</template> </template>
</Dialog> </Dialog>
<DialogCamera <DialogCamera
@ -2951,7 +2951,7 @@ const createZyys = (polygon, indexx, name, tooltip) => {
} else { } else {
zyysCenter.length = 0; zyysCenter.length = 0;
zyysDk.length = 0; zyysDk.length = 0;
await get_dk_zyys(polygon.fgfwrs, polygon.startAge, polygon.endAge); await get_dk_zyys(polygon.fgfwrs,polygon.lb);
xr_dk_center_zyys(); xr_dk_center_zyys();
} }
@ -3003,7 +3003,7 @@ const loadCs_zyys = async (name) => {
} }
} }
}; };
const get_dk_zyys = async (sj, start, end) => { const get_dk_zyys = async (sj,xd) => {
zyys_dk.value.length = 0; zyys_dk.value.length = 0;
zyys_center.value.length = 0; zyys_center.value.length = 0;
zyys_data.value.point.length = 0; zyys_data.value.point.length = 0;
@ -3020,20 +3020,23 @@ const get_dk_zyys = async (sj, start, end) => {
sj.forEach((item, index) => { sj.forEach((item, index) => {
zyysDk.forEach((dk) => { zyysDk.forEach((dk) => {
if (item.committee == dk.name) { if (item.committee == dk.name) {
zyys_data.value.point.push(dk); let a={
...dk,
zt:item.zt
}
zyys_data.value.point.push(a);
} }
}); });
zyysCenter.forEach((center) => { zyysCenter.forEach((center) => {
if (item.committee == center.name) { if (item.committee == center.name) {
let a = { let b = {
...center, ...center,
num: item.num, num: item.num,
town: item.town, town: item.town,
committee: item.committee, committee: item.committee,
startAge: start, xd: xd,
endAge: end,
}; };
zyys_data.value.center.push(a); zyys_data.value.center.push(b);
} }
}); });
}); });
@ -3041,6 +3044,10 @@ const get_dk_zyys = async (sj, start, end) => {
//资源要素(渲染地块) //资源要素(渲染地块)
const xr_dk_center_zyys = async () => { const xr_dk_center_zyys = async () => {
zyys_data.value.point.map((item, index) => { zyys_data.value.point.map((item, index) => {
let color="blue";
if(item.zt>0){
color="green";
}
let points = []; let points = [];
item.point[0].map((p) => points.push(new BMapGL.Point(...p))); item.point[0].map((p) => points.push(new BMapGL.Point(...p)));
if (points.length) { if (points.length) {
@ -3049,7 +3056,7 @@ const xr_dk_center_zyys = async () => {
strokeColor: "blue", strokeColor: "blue",
strokeWeight: 2, strokeWeight: 2,
strokeOpacity: 0.8, strokeOpacity: 0.8,
fillColor: "blue", fillColor: color,
fillOpacity: 0.3, fillOpacity: 0.3,
zIndex: 5, zIndex: 5,
}); });
@ -3065,8 +3072,7 @@ const xr_dk_center_zyys = async () => {
const zyys_table = reactive({ const zyys_table = reactive({
town: "", town: "",
committee: "", committee: "",
startAge: "", xd: "",
endAge: "",
}); });
const Xr_zyysNum = (polygon, indexx) => { const Xr_zyysNum = (polygon, indexx) => {
function createLabelDOM() { function createLabelDOM() {
@ -3137,8 +3143,7 @@ const Xr_zyysNum = (polygon, indexx) => {
tableType.columns = table_column_list.zxs; tableType.columns = table_column_list.zxs;
zyys_table.town = polygon.town; zyys_table.town = polygon.town;
zyys_table.committee = polygon.committee; zyys_table.committee = polygon.committee;
zyys_table.startAge = polygon.startAge; zyys_table.xd = polygon.xd;
zyys_table.endAge = polygon.endAge;
open_detail_zyys(); open_detail_zyys();
}); });
}; };
@ -3146,7 +3151,7 @@ const open_detail_zyys = () => {
dialogShow.value = true; dialogShow.value = true;
http http
.get( .get(
`/api/ggfwyth/ysyzt/getRyJbxxList?page=${pagination.currentPage}&size=${pagination.pageSize}&committee=${zyys_table.committee}&town=${zyys_table.town}&startAge=${zyys_table.startAge}&endAge=${zyys_table.endAge}` `/api/ggfwyth/ysyzt/getRyJbxxList?page=${pagination.currentPage}&size=${pagination.pageSize}&committee=${zyys_table.committee}&town=${zyys_table.town}&xd=${zyys_table.xd}`
) )
.then((res) => { .then((res) => {
if (res.code == 200) { if (res.code == 200) {