Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/views/sys/exception/Converge.vue

@@ -317,7 +317,6 @@ watchEffect(() => {
   function handlerOnMapLoad() {}
 
   function handlerGetDetails(e) {
-    console.log(e);
     getInfoList(e.Id);
   }
 

src/views/sys/exception/LargeScreenMap/index.vue

@@ -116,7 +116,7 @@ function handlerLoadPolygon(code="",filter="",type=""){
         sql_filter = "&filter=\"countyid\"=\'"+code+"\' and \"typename\"=\'农用地\'";
     }else{
         // sql_filter=""
-        sql_filter="\"typename\"=\'农用地\'"
+        sql_filter="&filter=\"typename\"=\'农用地\'"
     }
     let map_filter;
     
@@ -175,7 +175,7 @@ function handlerLoadPolygon(code="",filter="",type=""){
           'type': 'line',
           'source': {
             type: 'vector',
-            tiles: [VITE_GLOB_API_URL_VAR.value+'/api/DroneCaseInfoSingle/QueryVectorTileByTable?z={z}&x={x}&y={y}&table=view_drone_wfyd_map&'+sql_filter+'&field=\"gid\",\"handle_status_id\",\"is_illegal\",\"measure_name\",\"typename\",\"Id\",'],
+            tiles: [VITE_GLOB_API_URL_VAR.value+'/api/DroneCaseInfoSingle/QueryVectorTileByTable?z={z}&x={x}&y={y}&table=view_drone_wfyd_map'+sql_filter+'&field=\"gid\",\"handle_status_id\",\"is_illegal\",\"measure_name\",\"typename\",\"Id\",'],
             minzoom: 1,
             maxzoom: 20
           },
@@ -435,7 +435,7 @@ function handlerLoadHeatLayer(heatdata){
                     // 根据缩放等级设置热力图色彩  等级,热力图密度    
                     'heatmap-radius': [
                         'interpolate',['linear'],['zoom'],
-                        9,7,
+                        9,5.8,
                         10,18,
                         11,20,
                         12,24,