diff --git a/src/views/sys/exception/Exception.vue b/src/views/sys/exception/Exception.vue index 4c2eaa98..88575424 100644 --- a/src/views/sys/exception/Exception.vue +++ b/src/views/sys/exception/Exception.vue @@ -22,6 +22,7 @@ /> diff --git a/src/views/sys/exception/LargeScreenMap/index.vue b/src/views/sys/exception/LargeScreenMap/index.vue index c50b9171..e7608f20 100644 --- a/src/views/sys/exception/LargeScreenMap/index.vue +++ b/src/views/sys/exception/LargeScreenMap/index.vue @@ -67,8 +67,29 @@ function handlerLoadPolygon(code="",filter=""){ }else{ sql_filter="" } - if(map.getSource("historyLayerLine")){ + let map_filter; + switch(filter){ + case "合法": + map_filter = ["all",["==", ["get", "is_illegal"], 0],["==", ["get", "handle_status_id"], 5]]; + break; + case "违法": + map_filter = ["any",["==", ["get", "is_illegal"], 1],["!=", ["get", "handle_status_id"], 5]]; + break; + case "其他": + map_filter = ["all",["==", ["get", "is_illegal"], 2],["==", ["get", "handle_status_id"], 5]]; + break; + case "补办手续": + map_filter = ["all",["==", ["get", "measure_name"], 0],["==", ["get", "handle_status_id"], 5]]; + break; + case "拆除复耕": + map_filter = ["all",["==", ["get", "measure_name"], 1],["==", ["get", "handle_status_id"], 5]]; + break; + default: + map_filter = ["!=", ["get", "gid"], 0]; + } + console.log(map_filter,sql_filter); + if(map.getSource("historyLayerLine")){ map.removeLayer("historyLayerLine") map.removeLayer("historyLayerFill") map.removeSource("historyLayerLine") @@ -91,7 +112,7 @@ function handlerLoadPolygon(code="",filter=""){ 'line-join': 'round', 'line-cap': 'round' }, - // 'filter':['==','handle_status_id',0], + 'filter':map_filter, 'paint': { 'line-color': [ "case", @@ -122,6 +143,7 @@ function handlerLoadPolygon(code="",filter=""){ maxzoom: 20 }, "source-layer": "view_drone_shp_data", + 'filter':map_filter, 'paint': { 'fill-color': [ "case", @@ -143,12 +165,14 @@ function handlerLoadPolygon(code="",filter=""){ }) map.on("click","historyLayerFill",(e)=>{ - console.log('eee123',e,e.features[0].properties) + console.log('eee123',e.features[0].properties) }) + if(map.getLayer('heatLayer')){ + map.moveLayer('heatLayer', 'historyLayerLine'); + map.moveLayer('heatLayer', 'historyLayerFill'); + } - map.moveLayer('heatLayer', 'historyLayerLine'); - map.moveLayer('heatLayer', 'historyLayerFill'); } // 获取和处理图斑点数据 @@ -339,9 +363,9 @@ function handlerChangeLayerVisible(layerName,checked){ } // 切换县区 -function handlerChangeCounty(county){ +function handlerChangeCounty(county,type=""){ handlerDealCountry(county.name); - handlerLoadPolygon(county.code); + handlerLoadPolygon(county.code,type); handlerDealPoint(county.code); } diff --git a/src/views/sys/exception/mapComponent/left_statisticalType.vue b/src/views/sys/exception/mapComponent/left_statisticalType.vue index 8621729d..c23f622b 100644 --- a/src/views/sys/exception/mapComponent/left_statisticalType.vue +++ b/src/views/sys/exception/mapComponent/left_statisticalType.vue @@ -8,27 +8,27 @@ />
- + 违法 - + 补办手续 - + 合法 - + 拆除复耕 - + 其他 @@ -37,7 +37,15 @@
- +