diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 4cdc587..f239eaa 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1277,9 +1277,84 @@ "mType": "geojson" }, { + "id": "pipeline_info1", + "key": "hb_wh_dhgx_pipe_line1", + "source-layer": "hb_wh_dhgx_pipe_line1", + "type": "line", + "filter": [ + "all", + ["in", ["get", "管段类型"],["literal", ["污水","雨水"]]] + ], + "paint": { + "line-color": [ + "match", + ["get", "管段类型"], + "雨水", "#37BE5F", + "污水", "#E6061A", + "合流", "#ccff12", + "#000000" + ], + "line-width": [ + "match", + ["get", "级别"], + 1, 5, + 2, 2, + 2 + ] + }, + "layout": {}, + "minzoom": 0, + "maxzoom": 24, + "mType": "mvt", + "columns": "*,st_asText(geometrys) as geometry" + }, + { + "id": "pipeline_point1", + "key": "hb_wh_dhgx_pipe_point1", + "source-layer": "hb_wh_dhgx_pipe_point1", + "type": "symbol", + "filter": [ + "all", + ["in", ["get", "类型"],["literal", ["污水","雨水"]]] + ], + "paint": {"text-color": "#fff"}, + "layout": { + "icon-ignore-placement":true, + "icon-image": [ + "match", + ["concat", ["get", "类型"], ["get", "附属物"]], + "雨水进水口", "ys_排水口", + "雨水检修井", "ysj", + "雨水污水篦", "雨水箅", + "雨水窨井", "ysj", + "雨水出水口", "ys_排水口", + "雨水雨水箅", "雨水箅", + + "污水进水口", "ws_排水口", + "污水检修井", "wsj", + "污水污水篦", "污水箅", + "污水窨井", "wsj", + "污水出水口", "ws_排水口", + "污水雨水箅", "污水箅", + "预留口" + ], + "icon-size": 1, + "text-field": "{设施编号}", + "text-font": [ + "KlokanTech Noto Sans Regular" + ], + "text-size": 13, + "text-line-height": 3, + "text-anchor": "top" + }, + "minzoom": 14, + "maxzoom": 24, + "mType": "mvt", + "columns": "*,st_asText(geometrys) as geometry" + }, + { "id": "pipeline_info", "key": "hb_wh_dhgx_pipe_line_n_y_w", - "source-layer": "hb_wh_dhgx_pipe_line_n_y_w", "type": "line", "filter": [ "all", @@ -1299,13 +1374,12 @@ "layout": {}, "minzoom": 10, "maxzoom": 24, - "mType": "mvt", + "mType": "geojsonMvt", "columns": "segment_code AS 管段编码, pipeline_texture AS 管线材质, pipeline_diameter AS 管径, section_type AS 管段类型, flow_direction AS 流向, drainage_system AS 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { "id": "pipeline_point", "key": "hb_wh_dhgx_pipe_point_n_y_w", - "source-layer": "hb_wh_dhgx_pipe_point_n_y_w", "type": "symbol", "filter": [ "all", @@ -1343,13 +1417,12 @@ }, "minzoom": 14, "maxzoom": 24, - "mType": "mvt", + "mType": "geojsonMvt", "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { "id": "pipeline_info_text", "key": "hb_wh_dhgx_pipe_line_n_y_w", - "source-layer": "hb_wh_dhgx_pipe_line_n_y_w", "type": "symbol", "filter": [ "all", @@ -1395,7 +1468,7 @@ "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 2 }, - "mType": "mvt", + "mType": "geojsonMvt", "columns": "segment_code AS 管段编码, pipeline_texture AS 管线材质, pipeline_diameter AS 管径, section_type AS 管段类型, flow_direction AS 流向, drainage_system AS 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { @@ -1512,6 +1585,15 @@ "雨水管网":{"layerName": ["pipeline_info","pipeline_point", "pipeline_info_text"], "filter": [["YS"],["YS"],["YS"]]}, "污水管网":{"layerName": ["pipeline_info","pipeline_point", "pipeline_info_text"], "filter": [["WS","HS"],["WS","HS"],["WS","HS"]]}, + "污水管网1": { + "layerName": ["pipeline_info1", "pipeline_point1"], + "filter": [["污水"], ["污水"], ["污水"]] + }, + "雨水管网1": { + "layerName": ["pipeline_info1", "pipeline_point1"], + "filter": [["雨水"], ["雨水"], ["雨水"]] + }, + "花山镇":{"layerName": ["村", "村_text"], "filter": [["花山镇"],["花山镇"]]}, "滨湖街":{"layerName": ["村", "村_text"], "filter": [["滨湖街"],["滨湖街"]]}, "牛山湖养殖场":{"layerName": ["村", "村_text"], "filter": [["牛山湖养殖场"],["牛山湖养殖场"]]}, diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 4cdc587..f239eaa 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1277,9 +1277,84 @@ "mType": "geojson" }, { + "id": "pipeline_info1", + "key": "hb_wh_dhgx_pipe_line1", + "source-layer": "hb_wh_dhgx_pipe_line1", + "type": "line", + "filter": [ + "all", + ["in", ["get", "管段类型"],["literal", ["污水","雨水"]]] + ], + "paint": { + "line-color": [ + "match", + ["get", "管段类型"], + "雨水", "#37BE5F", + "污水", "#E6061A", + "合流", "#ccff12", + "#000000" + ], + "line-width": [ + "match", + ["get", "级别"], + 1, 5, + 2, 2, + 2 + ] + }, + "layout": {}, + "minzoom": 0, + "maxzoom": 24, + "mType": "mvt", + "columns": "*,st_asText(geometrys) as geometry" + }, + { + "id": "pipeline_point1", + "key": "hb_wh_dhgx_pipe_point1", + "source-layer": "hb_wh_dhgx_pipe_point1", + "type": "symbol", + "filter": [ + "all", + ["in", ["get", "类型"],["literal", ["污水","雨水"]]] + ], + "paint": {"text-color": "#fff"}, + "layout": { + "icon-ignore-placement":true, + "icon-image": [ + "match", + ["concat", ["get", "类型"], ["get", "附属物"]], + "雨水进水口", "ys_排水口", + "雨水检修井", "ysj", + "雨水污水篦", "雨水箅", + "雨水窨井", "ysj", + "雨水出水口", "ys_排水口", + "雨水雨水箅", "雨水箅", + + "污水进水口", "ws_排水口", + "污水检修井", "wsj", + "污水污水篦", "污水箅", + "污水窨井", "wsj", + "污水出水口", "ws_排水口", + "污水雨水箅", "污水箅", + "预留口" + ], + "icon-size": 1, + "text-field": "{设施编号}", + "text-font": [ + "KlokanTech Noto Sans Regular" + ], + "text-size": 13, + "text-line-height": 3, + "text-anchor": "top" + }, + "minzoom": 14, + "maxzoom": 24, + "mType": "mvt", + "columns": "*,st_asText(geometrys) as geometry" + }, + { "id": "pipeline_info", "key": "hb_wh_dhgx_pipe_line_n_y_w", - "source-layer": "hb_wh_dhgx_pipe_line_n_y_w", "type": "line", "filter": [ "all", @@ -1299,13 +1374,12 @@ "layout": {}, "minzoom": 10, "maxzoom": 24, - "mType": "mvt", + "mType": "geojsonMvt", "columns": "segment_code AS 管段编码, pipeline_texture AS 管线材质, pipeline_diameter AS 管径, section_type AS 管段类型, flow_direction AS 流向, drainage_system AS 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { "id": "pipeline_point", "key": "hb_wh_dhgx_pipe_point_n_y_w", - "source-layer": "hb_wh_dhgx_pipe_point_n_y_w", "type": "symbol", "filter": [ "all", @@ -1343,13 +1417,12 @@ }, "minzoom": 14, "maxzoom": 24, - "mType": "mvt", + "mType": "geojsonMvt", "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { "id": "pipeline_info_text", "key": "hb_wh_dhgx_pipe_line_n_y_w", - "source-layer": "hb_wh_dhgx_pipe_line_n_y_w", "type": "symbol", "filter": [ "all", @@ -1395,7 +1468,7 @@ "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 2 }, - "mType": "mvt", + "mType": "geojsonMvt", "columns": "segment_code AS 管段编码, pipeline_texture AS 管线材质, pipeline_diameter AS 管径, section_type AS 管段类型, flow_direction AS 流向, drainage_system AS 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { @@ -1512,6 +1585,15 @@ "雨水管网":{"layerName": ["pipeline_info","pipeline_point", "pipeline_info_text"], "filter": [["YS"],["YS"],["YS"]]}, "污水管网":{"layerName": ["pipeline_info","pipeline_point", "pipeline_info_text"], "filter": [["WS","HS"],["WS","HS"],["WS","HS"]]}, + "污水管网1": { + "layerName": ["pipeline_info1", "pipeline_point1"], + "filter": [["污水"], ["污水"], ["污水"]] + }, + "雨水管网1": { + "layerName": ["pipeline_info1", "pipeline_point1"], + "filter": [["雨水"], ["雨水"], ["雨水"]] + }, + "花山镇":{"layerName": ["村", "村_text"], "filter": [["花山镇"],["花山镇"]]}, "滨湖街":{"layerName": ["村", "村_text"], "filter": [["滨湖街"],["滨湖街"]]}, "牛山湖养殖场":{"layerName": ["村", "村_text"], "filter": [["牛山湖养殖场"],["牛山湖养殖场"]]}, diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index ade6271..13cdd1d 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -124,6 +124,23 @@ ], }, { + value: "武勘院管网", + label: "武勘院管网", + class: "target-class", + children: [ + { + value: "雨水管网1", + label: "雨水管网", + icon: getImageUrl("lay-yushuiguanwang.png", "images/NewLayercontrol"), + }, + { + value: "污水管网1", + label: "污水管网", + icon: getImageUrl("lay-wushuiguanwang.png", "images/NewLayercontrol"), + }, + ], + }, + { value: "监测点", label: "监测点", class: "target-class",