From c13a4b0e5fc797fedb67f274f752240ad5060a9e Mon Sep 17 00:00:00 2001 From: helloxujingliang <3225043@qq.com> Date: Sat, 5 Jul 2025 17:26:25 +0800 Subject: [PATCH] merge --- src/components/MapboxMaps/MapComponent.vue | 10 ++++++++-- .../MapList/SplitPolygonModal/index.vue | 15 ++++++++++----- .../MapList/SplitPolygonModal/index.vue | 15 ++++++++++----- .../MapList/SplitPolygonModal/index.vue | 15 ++++++++++----- .../MapList/SplitPolygonModal/index.vue | 15 ++++++++++----- .../MapList/SplitPolygonModal/index.vue | 15 ++++++++++----- .../MapList/SplitPolygonModal/index.vue | 17 +++++++++++------ 7 files changed, 69 insertions(+), 33 deletions(-) diff --git a/src/components/MapboxMaps/MapComponent.vue b/src/components/MapboxMaps/MapComponent.vue index b73e9358..c9b85dc8 100644 --- a/src/components/MapboxMaps/MapComponent.vue +++ b/src/components/MapboxMaps/MapComponent.vue @@ -109,7 +109,7 @@ - +
@@ -456,6 +456,11 @@ splitTubanBackYuan(calAreaParams).then(res=>{ + if(!res.gengdituban){ + message.warning("分割数据为空"); + emit("handlerSplitResultEmpty"); + } + let geojson = { type:"FeatureCollection", features:[] @@ -904,6 +909,7 @@ 'handlerSplitPolygon', 'handlerStartSpliting', 'onFeatureClick', + 'handlerSplitResultEmpty', ]); watch( diff --git a/src/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue index b62ca366..fd2e3842 100644 --- a/src/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/degraining/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -12,6 +12,7 @@ :geomsList="geomsList" :mapConfig="mapConfig" @handlerSplitPolygon="handlerSplitPolygon" + @handlerSplitResultEmpty="handlerSplitResultEmpty" @handlerStartSpliting="handlerStartSpliting" @mapOnLoad="onMapboxLoad" :caseid="id" @@ -1086,6 +1087,10 @@ }; + const handlerSplitResultEmpty = ()=>{ + isLandTypeSpliting.value = false; + } + // 处理面积 const handlerFeatureArea = ()=>{ let addArea = { @@ -1099,11 +1104,11 @@ splitPolygonForm.value?.forEach((item,index)=>{ // 处理最后一块图斑面积 if(index == splitPolygonForm.value.length-1){ - 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); + splitPolygonForm.value[index].area = (area - addArea.area).toFixed(2) > 0 ? (area - addArea.area).toFixed(2) : null; + splitPolygonForm.value[index].gengdi_area = (gengdi_area - addArea.gengdi_area).toFixed(2) > 0 ? (gengdi_area - addArea.gengdi_area).toFixed(2) : null; + splitPolygonForm.value[index].nongyongdi_area = (nongyongdi_area - addArea.nongyongdi_area).toFixed(2) > 0 ? (nongyongdi_area - addArea.nongyongdi_area).toFixed(2) : null; + splitPolygonForm.value[index].yongjiujibennongtian_area = (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2) > 0 ? (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2) : null; + splitPolygonForm.value[index].shengtaibaohuhongxian_area = (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2) > 0 ? (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2) : null; } // 累计面积 addArea.area = addArea.area + parseFloat(item.area); diff --git a/src/views/demo/inspectionaudit/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/inspectionaudit/curbspotcity/MapList/SplitPolygonModal/index.vue index bbd54c12..525af899 100644 --- a/src/views/demo/inspectionaudit/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/inspectionaudit/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -13,6 +13,7 @@ :geomsList="geomsList" :mapConfig="mapConfig" @handlerSplitPolygon="handlerSplitPolygon" + @handlerSplitResultEmpty="handlerSplitResultEmpty" @handlerStartSpliting="handlerStartSpliting" @mapOnLoad="onMapboxLoad" :caseid="id" @@ -1017,6 +1018,10 @@ import { itemProps } from '@/components/Menu/src/props'; } }; + const handlerSplitResultEmpty = ()=>{ + isLandTypeSpliting.value = false; + } + const handlerFeatureArea = ()=>{ let addArea = { area: 0, @@ -1029,11 +1034,11 @@ import { itemProps } from '@/components/Menu/src/props'; splitPolygonForm.value?.forEach((item,index)=>{ // 处理最后一块图斑面积 if(index == splitPolygonForm.value.length-1){ - 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); + splitPolygonForm.value[index].area = (area - addArea.area).toFixed(2) > 0 ? (area - addArea.area).toFixed(2) : null; + splitPolygonForm.value[index].gengdi_area = (gengdi_area - addArea.gengdi_area).toFixed(2) > 0 ? (gengdi_area - addArea.gengdi_area).toFixed(2) : null; + splitPolygonForm.value[index].nongyongdi_area = (nongyongdi_area - addArea.nongyongdi_area).toFixed(2) > 0 ? (nongyongdi_area - addArea.nongyongdi_area).toFixed(2) : null; + splitPolygonForm.value[index].yongjiujibennongtian_area = (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2) > 0 ? (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2) : null; + splitPolygonForm.value[index].shengtaibaohuhongxian_area = (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2) > 0 ? (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2) : null; } // 累计面积 addArea.area = addArea.area + parseFloat(item.area); 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 50a1b098..e12c8cf4 100644 --- a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -14,6 +14,7 @@ :geomsList="geomsList" :mapConfig="mapConfig" @handlerSplitPolygon="handlerSplitPolygon" + @handlerSplitResultEmpty="handlerSplitResultEmpty" @handlerStartSpliting="handlerStartSpliting" @mapOnLoad="onMapboxLoad" :splitPlugin="true" @@ -895,6 +896,10 @@ import { itemProps } from '@/components/Menu/src/props'; } }; + const handlerSplitResultEmpty = ()=>{ + isLandTypeSpliting.value = false; + } + // 处理面积 const handlerFeatureArea = ()=>{ let addArea = { @@ -908,11 +913,11 @@ import { itemProps } from '@/components/Menu/src/props'; splitPolygonForm.value?.forEach((item,index)=>{ // 处理最后一块图斑面积 if(index == splitPolygonForm.value.length-1){ - 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); + splitPolygonForm.value[index].area = (area - addArea.area).toFixed(2) > 0 ? (area - addArea.area).toFixed(2) : null; + splitPolygonForm.value[index].gengdi_area = (gengdi_area - addArea.gengdi_area).toFixed(2) > 0 ? (gengdi_area - addArea.gengdi_area).toFixed(2) : null; + splitPolygonForm.value[index].nongyongdi_area = (nongyongdi_area - addArea.nongyongdi_area).toFixed(2) > 0 ? (nongyongdi_area - addArea.nongyongdi_area).toFixed(2) : null; + splitPolygonForm.value[index].yongjiujibennongtian_area = (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2) > 0 ? (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2) : null; + splitPolygonForm.value[index].shengtaibaohuhongxian_area = (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2) > 0 ? (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2) : null; } // 累计面积 addArea.area = addArea.area + parseFloat(item.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 5276b14a..15cf5181 100644 --- a/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -14,6 +14,7 @@ :geomsList="geomsList" :mapConfig="mapConfig" @handlerSplitPolygon="handlerSplitPolygon" + @handlerSplitResultEmpty="handlerSplitResultEmpty" @handlerStartSpliting="handlerStartSpliting" @mapOnLoad="onMapboxLoad" :splitPlugin="true" @@ -892,6 +893,10 @@ const handleCancelPreviewFile = ()=>{ } }; + const handlerSplitResultEmpty = ()=>{ + isLandTypeSpliting.value = false; + } + // 处理面积 const handlerFeatureArea = ()=>{ let addArea = { @@ -905,11 +910,11 @@ const handleCancelPreviewFile = ()=>{ splitPolygonForm.value?.forEach((item,index)=>{ // 处理最后一块图斑面积 if(index == splitPolygonForm.value.length-1){ - 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); + splitPolygonForm.value[index].area = (area - addArea.area).toFixed(2) > 0 ? (area - addArea.area).toFixed(2) : null; + splitPolygonForm.value[index].gengdi_area = (gengdi_area - addArea.gengdi_area).toFixed(2) > 0 ? (gengdi_area - addArea.gengdi_area).toFixed(2) : null; + splitPolygonForm.value[index].nongyongdi_area = (nongyongdi_area - addArea.nongyongdi_area).toFixed(2) > 0 ? (nongyongdi_area - addArea.nongyongdi_area).toFixed(2) : null; + splitPolygonForm.value[index].yongjiujibennongtian_area = (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2) > 0 ? (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2) : null; + splitPolygonForm.value[index].shengtaibaohuhongxian_area = (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2) > 0 ? (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2) : null; } // 累计面积 addArea.area = addArea.area + parseFloat(item.area); diff --git a/src/views/demo/redlinesupervision/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/redlinesupervision/curbspotcity/MapList/SplitPolygonModal/index.vue index 3ff0e29b..461d10e3 100644 --- a/src/views/demo/redlinesupervision/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/redlinesupervision/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -15,6 +15,7 @@ :geomsList="geomsList" :mapConfig="mapConfig" @handlerSplitPolygon="handlerSplitPolygon" + @handlerSplitResultEmpty="handlerSplitResultEmpty" @handlerStartSpliting="handlerStartSpliting" @mapOnLoad="onMapboxLoad" :splitPlugin="true" @@ -925,6 +926,10 @@ } }; + const handlerSplitResultEmpty = ()=>{ + isLandTypeSpliting.value = false; + } + // 处理面积 const handlerFeatureArea = ()=>{ let addArea = { @@ -938,11 +943,11 @@ splitPolygonForm.value?.forEach((item,index)=>{ // 处理最后一块图斑面积 if(index == splitPolygonForm.value.length-1){ - 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); + splitPolygonForm.value[index].area = (area - addArea.area).toFixed(2) > 0 ? (area - addArea.area).toFixed(2) : null; + splitPolygonForm.value[index].gengdi_area = (gengdi_area - addArea.gengdi_area).toFixed(2) > 0 ? (gengdi_area - addArea.gengdi_area).toFixed(2) : null; + splitPolygonForm.value[index].nongyongdi_area = (nongyongdi_area - addArea.nongyongdi_area).toFixed(2) > 0 ? (nongyongdi_area - addArea.nongyongdi_area).toFixed(2) : null; + splitPolygonForm.value[index].yongjiujibennongtian_area = (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2) > 0 ? (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2) : null; + splitPolygonForm.value[index].shengtaibaohuhongxian_area = (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2) > 0 ? (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2) : null; } // 累计面积 addArea.area = addArea.area + parseFloat(item.area); diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/SplitPolygonModal/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/SplitPolygonModal/index.vue index 9b519432..6e9eac2e 100644 --- a/src/views/demo/tiankongdi/curbspotcity/MapList/SplitPolygonModal/index.vue +++ b/src/views/demo/tiankongdi/curbspotcity/MapList/SplitPolygonModal/index.vue @@ -12,6 +12,7 @@ :geomsList="geomsList" :mapConfig="mapConfig" @handlerSplitPolygon="handlerSplitPolygon" + @handlerSplitResultEmpty="handlerSplitResultEmpty" @handlerStartSpliting="handlerStartSpliting" @mapOnLoad="onMapboxLoad" :caseid="id" @@ -1014,24 +1015,28 @@ import { itemProps } from '@/components/Menu/src/props'; } }; + const handlerSplitResultEmpty = ()=>{ + isLandTypeSpliting.value = false; + } + // 处理面积 const handlerFeatureArea = ()=>{ let addArea = { area: 0, nongyongdi_area: 0, gengdi_area: 0, - yongjiujibennongtian_area: 0, + yongjiujibennongtiasn_area: 0, shengtaibaohuhongxian_area:0, } splitPolygonForm.value?.forEach((item,index)=>{ // 处理最后一块图斑面积 if(index == splitPolygonForm.value.length-1){ - 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); + splitPolygonForm.value[index].area = (area - addArea.area).toFixed(2) > 0 ? (area - addArea.area).toFixed(2) : null; + splitPolygonForm.value[index].gengdi_area = (gengdi_area - addArea.gengdi_area).toFixed(2) > 0 ? (gengdi_area - addArea.gengdi_area).toFixed(2) : null; + splitPolygonForm.value[index].nongyongdi_area = (nongyongdi_area - addArea.nongyongdi_area).toFixed(2) > 0 ? (nongyongdi_area - addArea.nongyongdi_area).toFixed(2) : null; + splitPolygonForm.value[index].yongjiujibennongtian_area = (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2) > 0 ? (yongjiujibennongtian_area - addArea.yongjiujibennongtian_area).toFixed(2) : null; + splitPolygonForm.value[index].shengtaibaohuhongxian_area = (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2) > 0 ? (shengtaibaohuhongxian_area - addArea.shengtaibaohuhongxian_area).toFixed(2) : null; } // 累计面积 addArea.area = addArea.area + parseFloat(item.area);