From 23108e2e645bc18b2b243d1c65cac2a11066953b Mon Sep 17 00:00:00 2001 From: helloxujingliang <3225043@qq.com> Date: Sat, 5 Jul 2025 15:27:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E6=96=91=E5=88=86=E5=89=B2=E5=90=8E?= =?UTF-8?q?=E9=9D=A2=E7=A7=AF=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MapList/SplitPolygonModal/index.vue | 35 ++---------- .../MapList/SplitPolygonModal/index.vue | 56 ++++++------------- .../MapList/SplitPolygonModal/index.vue | 33 ++--------- .../MapList/SplitPolygonModal/index.vue | 35 ++---------- .../MapList/SplitPolygonModal/index.vue | 33 ++--------- .../MapList/SplitPolygonModal/index.vue | 33 ++--------- 6 files changed, 44 insertions(+), 181 deletions(-) diff --git a/src/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue index a4b7f5db..b62ca366 100644 --- a/src/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -1087,7 +1087,7 @@ // 处理面积 - const handlerFeatureArea = ()=>{ + const handlerFeatureArea = ()=>{ let addArea = { area: 0, nongyongdi_area: 0, @@ -1097,43 +1097,20 @@ } splitPolygonForm.value?.forEach((item,index)=>{ - // 处理最后一块图斑面积 if(index == splitPolygonForm.value.length-1){ - - // 总面积 - // if(area - addArea.area > 0){ - // splitPolygonForm.value[index].area = area - addArea.area; - // }else if(area -addArea.area == 0){ - // splitPolygonForm.value[index].area = area - addArea.area; - // }else if(area -addArea.area < 0){ - // splitPolygonForm.value[index].area = 0; - // } - - // 耕地面积 - // if(gengdi_area - addArea.gengdi_area > 0){ - - - // }else if(gengdi_area -addArea.gengdi_area == 0){ - // splitPolygonForm.value[index].gengdi_area = gengdi_area - addArea.gengdi_area; - // }else if(gengdi_area -addArea.gengdi_area < 0){ - // splitPolygonForm.value[index].gengdi_area = 0; - // } - splitPolygonForm.value[index].area = (area - addArea.area).toFixed(2); splitPolygonForm.value[index].gengdi_area = (gengdi_area - addArea.gengdi_area).toFixed(2); splitPolygonForm.value[index].nongyongdi_area = (nongyongdi_area - addArea.nongyongdi_area).toFixed(2); splitPolygonForm.value[index].yongjiujibennongtian_area = (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2); splitPolygonForm.value[index].shengtaibaohuhongxian_area = (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2); - } - // 累计面积 - addArea.area = addArea.area + item.area; - addArea.gengdi_area = addArea.gengdi_area + item.gengdi_area; - addArea.nongyongdi_area = addArea.nongyongdi_area + item.nongyongdi_area; - addArea.yongjiujibennongtian_area = addArea.yongjiujibennongtian_area + item.yongjiujibennongtian_area; - addArea.shengtaibaohuhongxian_area = addArea.shengtaibaohuhongxian_area + item.shengtaibaohuhongxian_area; + addArea.area = addArea.area + parseFloat(item.area); + addArea.gengdi_area = addArea.gengdi_area + parseFloat(item.gengdi_area); + addArea.nongyongdi_area = addArea.nongyongdi_area + parseFloat(item.nongyongdi_area); + addArea.yongjiujibennongtian_area = addArea.yongjiujibennongtian_area + parseFloat(item.yongjiujibennongtian_area); + addArea.shengtaibaohuhongxian_area = addArea.shengtaibaohuhongxian_area + parseFloat(item.shengtaibaohuhongxian_area); }) diff --git a/src/views/demo/inspectionaudit/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/inspectionaudit/curbspotcity/MapList/SplitPolygonModal/index.vue index aef295c1..bbd54c12 100644 --- a/src/views/demo/inspectionaudit/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/inspectionaudit/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -957,12 +957,12 @@ import { itemProps } from '@/components/Menu/src/props'; countyname: countyname, streetname: streetname, isbuildname: '', - nongyongdi_area: resultItem.nongyongdi > 0 ? resultItem.nongyongdi : 0.00, - gengdi_area: resultItem.gengdi > 0 ? resultItem.gengdi : 0.00, - yongjiujibennongtian_area: resultItem.jibennongtian > 0 ? resultItem.jibennongtian : 0.00, - shengtaibaohuhongxian_area: resultItem.shengtaihongxian > 0 ? resultItem.shengtaihongxian : 0.00, + nongyongdi_area: resultItem.nongyongdi > 0 ? resultItem.nongyongdi : '0.00', + gengdi_area: resultItem.gengdi > 0 ? resultItem.gengdi : '0.00', + yongjiujibennongtian_area: resultItem.jibennongtian > 0 ? resultItem.jibennongtian : '0.00', + shengtaibaohuhongxian_area: resultItem.shengtaihongxian > 0 ? resultItem.shengtaihongxian : '0.00', guotukongjianguihua_area: null, - area: resultItem.totalmianji > 0 ? resultItem.totalmianji : 0.00, + area: resultItem.totalmianji > 0 ? resultItem.totalmianji : '0.00', geom: item, checked:false, }; @@ -1027,43 +1027,20 @@ import { itemProps } from '@/components/Menu/src/props'; } splitPolygonForm.value?.forEach((item,index)=>{ - // 处理最后一块图斑面积 if(index == splitPolygonForm.value.length-1){ - - // 总面积 - // if(area - addArea.area > 0){ - // splitPolygonForm.value[index].area = area - addArea.area; - // }else if(area -addArea.area == 0){ - // splitPolygonForm.value[index].area = area - addArea.area; - // }else if(area -addArea.area < 0){ - // splitPolygonForm.value[index].area = 0; - // } - - // 耕地面积 - // if(gengdi_area - addArea.gengdi_area > 0){ - - - // }else if(gengdi_area -addArea.gengdi_area == 0){ - // splitPolygonForm.value[index].gengdi_area = gengdi_area - addArea.gengdi_area; - // }else if(gengdi_area -addArea.gengdi_area < 0){ - // splitPolygonForm.value[index].gengdi_area = 0; - // } - splitPolygonForm.value[index].area = (area - addArea.area).toFixed(2); splitPolygonForm.value[index].gengdi_area = (gengdi_area - addArea.gengdi_area).toFixed(2); splitPolygonForm.value[index].nongyongdi_area = (nongyongdi_area - addArea.nongyongdi_area).toFixed(2); splitPolygonForm.value[index].yongjiujibennongtian_area = (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2); splitPolygonForm.value[index].shengtaibaohuhongxian_area = (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2); - } - // 累计面积 - addArea.area = addArea.area + item.area; - addArea.gengdi_area = addArea.gengdi_area + item.gengdi_area; - addArea.nongyongdi_area = addArea.nongyongdi_area + item.nongyongdi_area; - addArea.yongjiujibennongtian_area = addArea.yongjiujibennongtian_area + item.yongjiujibennongtian_area; - addArea.shengtaibaohuhongxian_area = addArea.shengtaibaohuhongxian_area + item.shengtaibaohuhongxian_area; + addArea.area = addArea.area + parseFloat(item.area); + addArea.gengdi_area = addArea.gengdi_area + parseFloat(item.gengdi_area); + addArea.nongyongdi_area = addArea.nongyongdi_area + parseFloat(item.nongyongdi_area); + addArea.yongjiujibennongtian_area = addArea.yongjiujibennongtian_area + parseFloat(item.yongjiujibennongtian_area); + addArea.shengtaibaohuhongxian_area = addArea.shengtaibaohuhongxian_area + parseFloat(item.shengtaibaohuhongxian_area); }) @@ -1250,7 +1227,9 @@ import { itemProps } from '@/components/Menu/src/props'; } calTubanArea(calAreaParams).then(resultItem=>{ + if(resultItem){ + let polygon = { fid: null, unitname: '', @@ -1259,16 +1238,15 @@ import { itemProps } from '@/components/Menu/src/props'; countyname: countyname, streetname: streetname, isbuildname: '', - nongyongdi_area: resultItem.nongyongdi > 0 ? resultItem.nongyongdi : 0.00, - gengdi_area: resultItem.gengdi > 0 ? resultItem.gengdi : 0.00, - yongjiujibennongtian_area: resultItem.jibennongtian > 0 ? resultItem.jibennongtian : 0.00, - shengtaibaohuhongxian_area: resultItem.shengtaihongxian > 0 ? resultItem.shengtaihongxian : 0.00, + nongyongdi_area: resultItem.nongyongdi > 0 ? resultItem.nongyongdi : '0.00', + gengdi_area: resultItem.gengdi > 0 ? resultItem.gengdi : '0.00', + yongjiujibennongtian_area: resultItem.jibennongtian > 0 ? resultItem.jibennongtian : '0.00', + shengtaibaohuhongxian_area: resultItem.shengtaihongxian > 0 ? resultItem.shengtaihongxian : '0.00', guotukongjianguihua_area: null, - area: resultItem.totalmianji > 0 ? resultItem.totalmianji : 0.00, + area: resultItem.totalmianji > 0 ? resultItem.totalmianji : '0.00', geom: union, checked:false, } - splitAfterPolygon.value?.push(union); splitPolygonForm.value?.push(polygon); diff --git a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/SplitPolygonModal/index.vue index 252f577a..50a1b098 100644 --- a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -906,43 +906,20 @@ import { itemProps } from '@/components/Menu/src/props'; } splitPolygonForm.value?.forEach((item,index)=>{ - // 处理最后一块图斑面积 if(index == splitPolygonForm.value.length-1){ - - // 总面积 - // if(area - addArea.area > 0){ - // splitPolygonForm.value[index].area = area - addArea.area; - // }else if(area -addArea.area == 0){ - // splitPolygonForm.value[index].area = area - addArea.area; - // }else if(area -addArea.area < 0){ - // splitPolygonForm.value[index].area = 0; - // } - - // 耕地面积 - // if(gengdi_area - addArea.gengdi_area > 0){ - - - // }else if(gengdi_area -addArea.gengdi_area == 0){ - // splitPolygonForm.value[index].gengdi_area = gengdi_area - addArea.gengdi_area; - // }else if(gengdi_area -addArea.gengdi_area < 0){ - // splitPolygonForm.value[index].gengdi_area = 0; - // } - splitPolygonForm.value[index].area = (area - addArea.area).toFixed(2); splitPolygonForm.value[index].gengdi_area = (gengdi_area - addArea.gengdi_area).toFixed(2); splitPolygonForm.value[index].nongyongdi_area = (nongyongdi_area - addArea.nongyongdi_area).toFixed(2); splitPolygonForm.value[index].yongjiujibennongtian_area = (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2); splitPolygonForm.value[index].shengtaibaohuhongxian_area = (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2); - } - // 累计面积 - addArea.area = addArea.area + item.area; - addArea.gengdi_area = addArea.gengdi_area + item.gengdi_area; - addArea.nongyongdi_area = addArea.nongyongdi_area + item.nongyongdi_area; - addArea.yongjiujibennongtian_area = addArea.yongjiujibennongtian_area + item.yongjiujibennongtian_area; - addArea.shengtaibaohuhongxian_area = addArea.shengtaibaohuhongxian_area + item.shengtaibaohuhongxian_area; + addArea.area = addArea.area + parseFloat(item.area); + addArea.gengdi_area = addArea.gengdi_area + parseFloat(item.gengdi_area); + addArea.nongyongdi_area = addArea.nongyongdi_area + parseFloat(item.nongyongdi_area); + addArea.yongjiujibennongtian_area = addArea.yongjiujibennongtian_area + parseFloat(item.yongjiujibennongtian_area); + addArea.shengtaibaohuhongxian_area = addArea.shengtaibaohuhongxian_area + parseFloat(item.shengtaibaohuhongxian_area); }) diff --git a/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/SplitPolygonModal/index.vue index 2b4e19be..5276b14a 100644 --- a/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -381,7 +381,7 @@
- + 合并图斑   @@ -903,43 +903,20 @@ const handleCancelPreviewFile = ()=>{ } splitPolygonForm.value?.forEach((item,index)=>{ - // 处理最后一块图斑面积 if(index == splitPolygonForm.value.length-1){ - - // 总面积 - // if(area - addArea.area > 0){ - // splitPolygonForm.value[index].area = area - addArea.area; - // }else if(area -addArea.area == 0){ - // splitPolygonForm.value[index].area = area - addArea.area; - // }else if(area -addArea.area < 0){ - // splitPolygonForm.value[index].area = 0; - // } - - // 耕地面积 - // if(gengdi_area - addArea.gengdi_area > 0){ - - - // }else if(gengdi_area -addArea.gengdi_area == 0){ - // splitPolygonForm.value[index].gengdi_area = gengdi_area - addArea.gengdi_area; - // }else if(gengdi_area -addArea.gengdi_area < 0){ - // splitPolygonForm.value[index].gengdi_area = 0; - // } - splitPolygonForm.value[index].area = (area - addArea.area).toFixed(2); splitPolygonForm.value[index].gengdi_area = (gengdi_area - addArea.gengdi_area).toFixed(2); splitPolygonForm.value[index].nongyongdi_area = (nongyongdi_area - addArea.nongyongdi_area).toFixed(2); splitPolygonForm.value[index].yongjiujibennongtian_area = (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2); splitPolygonForm.value[index].shengtaibaohuhongxian_area = (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2); - } - // 累计面积 - addArea.area = addArea.area + item.area; - addArea.gengdi_area = addArea.gengdi_area + item.gengdi_area; - addArea.nongyongdi_area = addArea.nongyongdi_area + item.nongyongdi_area; - addArea.yongjiujibennongtian_area = addArea.yongjiujibennongtian_area + item.yongjiujibennongtian_area; - addArea.shengtaibaohuhongxian_area = addArea.shengtaibaohuhongxian_area + item.shengtaibaohuhongxian_area; + addArea.area = addArea.area + parseFloat(item.area); + addArea.gengdi_area = addArea.gengdi_area + parseFloat(item.gengdi_area); + addArea.nongyongdi_area = addArea.nongyongdi_area + parseFloat(item.nongyongdi_area); + addArea.yongjiujibennongtian_area = addArea.yongjiujibennongtian_area + parseFloat(item.yongjiujibennongtian_area); + addArea.shengtaibaohuhongxian_area = addArea.shengtaibaohuhongxian_area + parseFloat(item.shengtaibaohuhongxian_area); }) diff --git a/src/views/demo/redlinesupervision/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/redlinesupervision/curbspotcity/MapList/SplitPolygonModal/index.vue index 4c1e3a57..3ff0e29b 100644 --- a/src/views/demo/redlinesupervision/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/redlinesupervision/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -936,43 +936,20 @@ } splitPolygonForm.value?.forEach((item,index)=>{ - // 处理最后一块图斑面积 if(index == splitPolygonForm.value.length-1){ - - // 总面积 - // if(area - addArea.area > 0){ - // splitPolygonForm.value[index].area = area - addArea.area; - // }else if(area -addArea.area == 0){ - // splitPolygonForm.value[index].area = area - addArea.area; - // }else if(area -addArea.area < 0){ - // splitPolygonForm.value[index].area = 0; - // } - - // 耕地面积 - // if(gengdi_area - addArea.gengdi_area > 0){ - - - // }else if(gengdi_area -addArea.gengdi_area == 0){ - // splitPolygonForm.value[index].gengdi_area = gengdi_area - addArea.gengdi_area; - // }else if(gengdi_area -addArea.gengdi_area < 0){ - // splitPolygonForm.value[index].gengdi_area = 0; - // } - splitPolygonForm.value[index].area = (area - addArea.area).toFixed(2); splitPolygonForm.value[index].gengdi_area = (gengdi_area - addArea.gengdi_area).toFixed(2); splitPolygonForm.value[index].nongyongdi_area = (nongyongdi_area - addArea.nongyongdi_area).toFixed(2); splitPolygonForm.value[index].yongjiujibennongtian_area = (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2); splitPolygonForm.value[index].shengtaibaohuhongxian_area = (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2); - } - // 累计面积 - addArea.area = addArea.area + item.area; - addArea.gengdi_area = addArea.gengdi_area + item.gengdi_area; - addArea.nongyongdi_area = addArea.nongyongdi_area + item.nongyongdi_area; - addArea.yongjiujibennongtian_area = addArea.yongjiujibennongtian_area + item.yongjiujibennongtian_area; - addArea.shengtaibaohuhongxian_area = addArea.shengtaibaohuhongxian_area + item.shengtaibaohuhongxian_area; + addArea.area = addArea.area + parseFloat(item.area); + addArea.gengdi_area = addArea.gengdi_area + parseFloat(item.gengdi_area); + addArea.nongyongdi_area = addArea.nongyongdi_area + parseFloat(item.nongyongdi_area); + addArea.yongjiujibennongtian_area = addArea.yongjiujibennongtian_area + parseFloat(item.yongjiujibennongtian_area); + addArea.shengtaibaohuhongxian_area = addArea.shengtaibaohuhongxian_area + parseFloat(item.shengtaibaohuhongxian_area); }) diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/SplitPolygonModal/index.vue index a46d932f..9b519432 100644 --- a/src/views/demo/tiankongdi/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/tiankongdi/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -1025,43 +1025,20 @@ import { itemProps } from '@/components/Menu/src/props'; } splitPolygonForm.value?.forEach((item,index)=>{ - // 处理最后一块图斑面积 if(index == splitPolygonForm.value.length-1){ - - // 总面积 - // if(area - addArea.area > 0){ - // splitPolygonForm.value[index].area = area - addArea.area; - // }else if(area -addArea.area == 0){ - // splitPolygonForm.value[index].area = area - addArea.area; - // }else if(area -addArea.area < 0){ - // splitPolygonForm.value[index].area = 0; - // } - - // 耕地面积 - // if(gengdi_area - addArea.gengdi_area > 0){ - - - // }else if(gengdi_area -addArea.gengdi_area == 0){ - // splitPolygonForm.value[index].gengdi_area = gengdi_area - addArea.gengdi_area; - // }else if(gengdi_area -addArea.gengdi_area < 0){ - // splitPolygonForm.value[index].gengdi_area = 0; - // } - splitPolygonForm.value[index].area = (area - addArea.area).toFixed(2); splitPolygonForm.value[index].gengdi_area = (gengdi_area - addArea.gengdi_area).toFixed(2); splitPolygonForm.value[index].nongyongdi_area = (nongyongdi_area - addArea.nongyongdi_area).toFixed(2); splitPolygonForm.value[index].yongjiujibennongtian_area = (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2); splitPolygonForm.value[index].shengtaibaohuhongxian_area = (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2); - } - // 累计面积 - addArea.area = addArea.area + item.area; - addArea.gengdi_area = addArea.gengdi_area + item.gengdi_area; - addArea.nongyongdi_area = addArea.nongyongdi_area + item.nongyongdi_area; - addArea.yongjiujibennongtian_area = addArea.yongjiujibennongtian_area + item.yongjiujibennongtian_area; - addArea.shengtaibaohuhongxian_area = addArea.shengtaibaohuhongxian_area + item.shengtaibaohuhongxian_area; + addArea.area = addArea.area + parseFloat(item.area); + addArea.gengdi_area = addArea.gengdi_area + parseFloat(item.gengdi_area); + addArea.nongyongdi_area = addArea.nongyongdi_area + parseFloat(item.nongyongdi_area); + addArea.yongjiujibennongtian_area = addArea.yongjiujibennongtian_area + parseFloat(item.yongjiujibennongtian_area); + addArea.shengtaibaohuhongxian_area = addArea.shengtaibaohuhongxian_area + parseFloat(item.shengtaibaohuhongxian_area); })