diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 3b09758..e3202dd 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -990,10 +990,9 @@ "fill-color": "rgba(31,184,255,1)", "fill-opacity": 0.8 }, - "filter": [ - "all", - ["in", ["get", "w_id"], ["literal", [""]]] - ], + "layout": { + "visibility": "none" + }, "minzoom": 7, "maxzoom": 24, "mType": "geojsonMvt", @@ -1004,10 +1003,7 @@ "key": "hb_wh_dhgx_gq11", "type": "symbol", "minzoom": 1, - "filter": [ - "all", - ["in", ["get", "w_id"], ["literal", [""]]] - ], + "layout": { "text-field": "{name}", "text-font": ["KlokanTech Noto Sans Regular"], @@ -1016,7 +1012,8 @@ "text-size": 20, "text-anchor": "top", "text-offset": [0,0], - "text-transform": "uppercase" + "text-transform": "uppercase", + "visibility": "none" }, "paint": { "text-color": "rgba(230,8,28,1)", diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 3b09758..e3202dd 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -990,10 +990,9 @@ "fill-color": "rgba(31,184,255,1)", "fill-opacity": 0.8 }, - "filter": [ - "all", - ["in", ["get", "w_id"], ["literal", [""]]] - ], + "layout": { + "visibility": "none" + }, "minzoom": 7, "maxzoom": 24, "mType": "geojsonMvt", @@ -1004,10 +1003,7 @@ "key": "hb_wh_dhgx_gq11", "type": "symbol", "minzoom": 1, - "filter": [ - "all", - ["in", ["get", "w_id"], ["literal", [""]]] - ], + "layout": { "text-field": "{name}", "text-font": ["KlokanTech Noto Sans Regular"], @@ -1016,7 +1012,8 @@ "text-size": 20, "text-anchor": "top", "text-offset": [0,0], - "text-transform": "uppercase" + "text-transform": "uppercase", + "visibility": "none" }, "paint": { "text-color": "rgba(230,8,28,1)", diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 870b94e..8a858a0 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -131,6 +131,10 @@ value: 'rainwater_pipeline_quality_area', label: '社区雨水接驳口', }, + { + value: 'rainwater_pipeline_quality', + label: '市政监测点', + }, ], }, { @@ -139,6 +143,18 @@ class: 'target-class', children: [ { + value: 'drainage_info', + label: '排水户', + }, + { + value: '港渠', + label: '港渠', + }, + { + value: 'outlet_info', + label: '排口', + }, + { value: '建筑物', label: '建筑物', }, @@ -182,7 +198,7 @@ openLayer.length && openLayer.map(i => i.split(',')).flat(Infinity).forEach(key => bus.emit('setLayerVisible', {layername: key, isCheck: key.includes('!') ? false : true,})); closeLayer.length && closeLayer.map(i => i.split(',')).flat(Infinity).forEach(key => bus.emit('setLayerVisible', {layername: key, isCheck: key.includes('!') ? true : false,})); - newfiberMap.map.triggerRepaint(); + // newfiberMap.map.triggerRepaint(); } function changeyangshi() { diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 3b09758..e3202dd 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -990,10 +990,9 @@ "fill-color": "rgba(31,184,255,1)", "fill-opacity": 0.8 }, - "filter": [ - "all", - ["in", ["get", "w_id"], ["literal", [""]]] - ], + "layout": { + "visibility": "none" + }, "minzoom": 7, "maxzoom": 24, "mType": "geojsonMvt", @@ -1004,10 +1003,7 @@ "key": "hb_wh_dhgx_gq11", "type": "symbol", "minzoom": 1, - "filter": [ - "all", - ["in", ["get", "w_id"], ["literal", [""]]] - ], + "layout": { "text-field": "{name}", "text-font": ["KlokanTech Noto Sans Regular"], @@ -1016,7 +1012,8 @@ "text-size": 20, "text-anchor": "top", "text-offset": [0,0], - "text-transform": "uppercase" + "text-transform": "uppercase", + "visibility": "none" }, "paint": { "text-color": "rgba(230,8,28,1)", diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 870b94e..8a858a0 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -131,6 +131,10 @@ value: 'rainwater_pipeline_quality_area', label: '社区雨水接驳口', }, + { + value: 'rainwater_pipeline_quality', + label: '市政监测点', + }, ], }, { @@ -139,6 +143,18 @@ class: 'target-class', children: [ { + value: 'drainage_info', + label: '排水户', + }, + { + value: '港渠', + label: '港渠', + }, + { + value: 'outlet_info', + label: '排口', + }, + { value: '建筑物', label: '建筑物', }, @@ -182,7 +198,7 @@ openLayer.length && openLayer.map(i => i.split(',')).flat(Infinity).forEach(key => bus.emit('setLayerVisible', {layername: key, isCheck: key.includes('!') ? false : true,})); closeLayer.length && closeLayer.map(i => i.split(',')).flat(Infinity).forEach(key => bus.emit('setLayerVisible', {layername: key, isCheck: key.includes('!') ? true : false,})); - newfiberMap.map.triggerRepaint(); + // newfiberMap.map.triggerRepaint(); } function changeyangshi() { diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue index fdb3f4d..ecc2cee 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue @@ -305,11 +305,8 @@ name: "雨水体系", key: "rain", values: [ {key: "雨水分区1", visible: true}, - {key: "高清地图", visible: true}, - {key: "outlet_info2", visible: false}, - {key: "排口流向", visible: false}, - {key: "排口流向1", visible: false}, - {key: "rainwater_pipeline_quality1", visible: false} + {key: "雨水系统流向", visible: true}, + {key: "雨水系统流向1", visible: true} ] }, ],