diff --git a/src/views/sys/exception/Converge/index.vue b/src/views/sys/exception/Converge/index.vue index aa0e61a9..efc9751e 100644 --- a/src/views/sys/exception/Converge/index.vue +++ b/src/views/sys/exception/Converge/index.vue @@ -861,9 +861,6 @@ }) - - - // 抛出函数 defineExpose({ handlerChangeCounty, // 切换县区 diff --git a/src/views/sys/exception/LargeScreenMap/index.vue b/src/views/sys/exception/LargeScreenMap/index.vue index 237d4867..1317445a 100644 --- a/src/views/sys/exception/LargeScreenMap/index.vue +++ b/src/views/sys/exception/LargeScreenMap/index.vue @@ -113,9 +113,10 @@ const polygonVisibility = ref("none"); function handlerLoadPolygon(code="",filter="",type=""){ let sql_filter; if(code){ - sql_filter = "&filter=\"countyid\"=\'"+code+"\'"; + sql_filter = "&filter=\"countyid\"=\'"+code+"\' and \"typename\"=\'农用地\'"; }else{ - sql_filter="" + // sql_filter="" + sql_filter="\"typename\"=\'农用地\'" } let map_filter; @@ -250,9 +251,9 @@ const currentCode = ref("") async function handlerDealPoint(code=""){ let sql_filter; if(code){ - sql_filter = "\"countyid\"=\'"+code+"\'"; + sql_filter = "\"countyid\"=\'"+code+"\' and \"typename\"=\'农用地\'"; }else{ - sql_filter="" + sql_filter="\"typename\"=\'农用地\'" } let points = await getPolygonCenter({tablename:"view_drone_wfyd_map",filter:sql_filter,createtime:dayjs().subtract(30, 'day').format('YYYY-MM-DD')}) @@ -349,7 +350,7 @@ function handlerLoadHeatLayer(heatdata){ 'id': 'heatLayer', 'type': 'heatmap', 'source': 'heatSource', - 'maxzoom': 13, + 'maxzoom': 15, 'minzoom':7, 'layout':{ "visibility":"visible" @@ -434,10 +435,11 @@ function handlerLoadHeatLayer(heatdata){ // 根据缩放等级设置热力图色彩 等级,热力图密度 'heatmap-radius': [ 'interpolate',['linear'],['zoom'], - 9,5.5, - 10,13, + 9,7, + 10,18, + 11,20, 12,24, - 14,32, + 14,28, ], 'heatmap-opacity': 0.9 }