diff --git a/index.html b/index.html index 6f7dde6..b1c67fa 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,7 @@ [endif]--> - @@ -217,8 +217,8 @@ opacity: 0.5; } - .l7-popup-content{ - background:rgba(0,0,0,0) !important; + .l7-popup-content { + background: rgba(0, 0, 0, 0) !important; } diff --git a/index.html b/index.html index 6f7dde6..b1c67fa 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,7 @@ [endif]--> - @@ -217,8 +217,8 @@ opacity: 0.5; } - .l7-popup-content{ - background:rgba(0,0,0,0) !important; + .l7-popup-content { + background: rgba(0, 0, 0, 0) !important; } diff --git a/public/static/libs/mapbox/images/stop.png b/public/static/libs/mapbox/images/stop.png new file mode 100644 index 0000000..6465f03 --- /dev/null +++ b/public/static/libs/mapbox/images/stop.png Binary files differ diff --git a/index.html b/index.html index 6f7dde6..b1c67fa 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,7 @@ [endif]--> - @@ -217,8 +217,8 @@ opacity: 0.5; } - .l7-popup-content{ - background:rgba(0,0,0,0) !important; + .l7-popup-content { + background: rgba(0, 0, 0, 0) !important; } diff --git a/public/static/libs/mapbox/images/stop.png b/public/static/libs/mapbox/images/stop.png new file mode 100644 index 0000000..6465f03 --- /dev/null +++ b/public/static/libs/mapbox/images/stop.png Binary files differ diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 3a5727f..e876e85 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -56,6 +56,7 @@ "pine1-lod2": "https://supermap0.wh-nf.cn:8090/resource/glb/pine1-lod2.glb" }, "images": [ + {"name": "stop", "url": "/static/libs/mapbox/images/stop.png"}, {"name": "水库水位@2x", "url": "/static/libs/mapbox/images/水库水位@2x.png"}, {"name": "污水处理站", "url": "/static/libs/mapbox/images/污水处理站.png"}, {"name": "堤防备料@2x", "url": "/static/libs/mapbox/images/堤防备料@2x.png"}, @@ -1200,6 +1201,9 @@ "waterlogging","渍水监测点扎点@2x", "waterlogging_point_info","渍水点扎点@2x", "sewage_pump_station_info","污水泵站扎点@2x", + "sewage_pump_station_info_city","污水泵站扎点@2x", + "sewage_pump_station_info_stop","stop", + "sewage_pump_station_info_city_stop","stop", "sewage_pump_station_info1","污水泵站扎点@2x", "sewage_factory_info","污水处理厂扎点@2x", "channel_water_level","港渠水位扎点@2x", @@ -1591,47 +1595,178 @@ "filter": { "污水分区1": { "layerName": ["hb_wh_dhgx_merge", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_text"], - "filter": [["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"], ["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"],["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"]] + "filter": [ + ["排水分区_污水分区_1", "排水分区_污水分区_2", "排水分区_污水分区_3", "排水分区_污水分区_4"], + ["排水分区_污水分区_1", "排水分区_污水分区_2", "排水分区_污水分区_3", "排水分区_污水分区_4"], + ["排水分区_污水分区_1", "排水分区_污水分区_2", "排水分区_污水分区_3", "排水分区_污水分区_4"] + ] }, "雨水分区1": { "layerName": ["hb_wh_dhgx_merge", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_text"], - "filter": [["排水分区_雨水分区_1","排水分区_雨水分区_2","排水分区_雨水分区_3","排水分区_雨水分区_4"], ["排水分区_雨水分区_1","排水分区_雨水分区_2","排水分区_雨水分区_3","排水分区_雨水分区_4"],["排水分区_雨水分区_1","排水分区_雨水分区_2","排水分区_雨水分区_3","排水分区_雨水分区_4"]] + "filter": [ + ["排水分区_雨水分区_1", "排水分区_雨水分区_2", "排水分区_雨水分区_3", "排水分区_雨水分区_4"], + ["排水分区_雨水分区_1", "排水分区_雨水分区_2", "排水分区_雨水分区_3", "排水分区_雨水分区_4"], + ["排水分区_雨水分区_1", "排水分区_雨水分区_2", "排水分区_雨水分区_3", "排水分区_雨水分区_4"] + ] }, "污水分区": { "layerName": ["排水分区", "排水分区_text"], - "filter": [["WS1"],["WS1"]] + "filter": [["WS1"], ["WS1"]] }, "雨水分区": { "layerName": ["排水分区", "排水分区_text"], - "filter": [["YS1"],["YS1"]] + "filter": [["YS1"], ["YS1"]] }, "排水分区_close": { "layerName": ["排水分区", "排水分区_text"], "filter": [ - ["WS龙王咀污水系统", "WS荣军2#片", "WS龙王咀片", "WS荣军4#片", "WS荣军1#片", "WS虹景1#片", "WS荣军3#片", "WS鲁巷片", "WS关南片", "WS", "YS1", "YS", "WS民院1#片", "YS豹澥湖汇水区", "WS绣球山片", "WS关南2#片", "YS茶山刘闸3#片", "YS茶山刘", "YS龙王咀", "YS民院闸10#片", "YS民院闸11#片", "YS民院闸6#片", "YS龙王咀2#片", "YS民院闸5#片", "YS民院闸7#片", "YS尾水箱涵片", "WS关东片", "YS民院闸8#片", "YS水蓝郡片", "YS民院闸1#片", "YS民院闸4#片", "YS民院闸3#片", "YS南湖汇水区", "YS民院闸片", "YS龙王咀1#片", "YS茶山刘闸2#片", "YS民院闸2#片", "WS民院片", "WS关南1#片", "WS关南3#片", "WS虹景2#片", "WS关南4#片", "YS民院闸9#片", "YS水蓝郡", "YS尾水箱涵", "YS南湖大道", "YS锦绣良缘", "YS财经政法片", "WS华科片", "WS民院2#片", "YS茶山刘闸4#片", "YS南湖大道片", "YS锦绣良缘片", "WS1", "YS茶山刘闸1#片", "WS荣军片", "WS虹景片", "YS财经政法"], - ["WS龙王咀污水系统", "WS荣军2#片", "WS龙王咀片", "WS荣军4#片", "WS荣军1#片", "WS虹景1#片", "WS荣军3#片", "WS鲁巷片", "WS关南片", "WS", "YS1", "YS", "WS民院1#片", "YS豹澥湖汇水区", "WS绣球山片", "WS关南2#片", "YS茶山刘闸3#片", "YS茶山刘", "YS龙王咀", "YS民院闸10#片", "YS民院闸11#片", "YS民院闸6#片", "YS龙王咀2#片", "YS民院闸5#片", "YS民院闸7#片", "YS尾水箱涵片", "WS关东片", "YS民院闸8#片", "YS水蓝郡片", "YS民院闸1#片", "YS民院闸4#片", "YS民院闸3#片", "YS南湖汇水区", "YS民院闸片", "YS龙王咀1#片", "YS茶山刘闸2#片", "YS民院闸2#片", "WS民院片", "WS关南1#片", "WS关南3#片", "WS虹景2#片", "WS关南4#片", "YS民院闸9#片", "YS水蓝郡", "YS尾水箱涵", "YS南湖大道", "YS锦绣良缘", "YS财经政法片", "WS华科片", "WS民院2#片", "YS茶山刘闸4#片", "YS南湖大道片", "YS锦绣良缘片", "WS1", "YS茶山刘闸1#片", "WS荣军片", "WS虹景片", "YS财经政法"] + [ + "WS龙王咀污水系统", + "WS荣军2#片", + "WS龙王咀片", + "WS荣军4#片", + "WS荣军1#片", + "WS虹景1#片", + "WS荣军3#片", + "WS鲁巷片", + "WS关南片", + "WS", + "YS1", + "YS", + "WS民院1#片", + "YS豹澥湖汇水区", + "WS绣球山片", + "WS关南2#片", + "YS茶山刘闸3#片", + "YS茶山刘", + "YS龙王咀", + "YS民院闸10#片", + "YS民院闸11#片", + "YS民院闸6#片", + "YS龙王咀2#片", + "YS民院闸5#片", + "YS民院闸7#片", + "YS尾水箱涵片", + "WS关东片", + "YS民院闸8#片", + "YS水蓝郡片", + "YS民院闸1#片", + "YS民院闸4#片", + "YS民院闸3#片", + "YS南湖汇水区", + "YS民院闸片", + "YS龙王咀1#片", + "YS茶山刘闸2#片", + "YS民院闸2#片", + "WS民院片", + "WS关南1#片", + "WS关南3#片", + "WS虹景2#片", + "WS关南4#片", + "YS民院闸9#片", + "YS水蓝郡", + "YS尾水箱涵", + "YS南湖大道", + "YS锦绣良缘", + "YS财经政法片", + "WS华科片", + "WS民院2#片", + "YS茶山刘闸4#片", + "YS南湖大道片", + "YS锦绣良缘片", + "WS1", + "YS茶山刘闸1#片", + "WS荣军片", + "WS虹景片", + "YS财经政法" + ], + [ + "WS龙王咀污水系统", + "WS荣军2#片", + "WS龙王咀片", + "WS荣军4#片", + "WS荣军1#片", + "WS虹景1#片", + "WS荣军3#片", + "WS鲁巷片", + "WS关南片", + "WS", + "YS1", + "YS", + "WS民院1#片", + "YS豹澥湖汇水区", + "WS绣球山片", + "WS关南2#片", + "YS茶山刘闸3#片", + "YS茶山刘", + "YS龙王咀", + "YS民院闸10#片", + "YS民院闸11#片", + "YS民院闸6#片", + "YS龙王咀2#片", + "YS民院闸5#片", + "YS民院闸7#片", + "YS尾水箱涵片", + "WS关东片", + "YS民院闸8#片", + "YS水蓝郡片", + "YS民院闸1#片", + "YS民院闸4#片", + "YS民院闸3#片", + "YS南湖汇水区", + "YS民院闸片", + "YS龙王咀1#片", + "YS茶山刘闸2#片", + "YS民院闸2#片", + "WS民院片", + "WS关南1#片", + "WS关南3#片", + "WS虹景2#片", + "WS关南4#片", + "YS民院闸9#片", + "YS水蓝郡", + "YS尾水箱涵", + "YS南湖大道", + "YS锦绣良缘", + "YS财经政法片", + "WS华科片", + "WS民院2#片", + "YS茶山刘闸4#片", + "YS南湖大道片", + "YS锦绣良缘片", + "WS1", + "YS茶山刘闸1#片", + "WS荣军片", + "WS虹景片", + "YS财经政法" + ] ] }, "渍水风险点": { "layerName": ["渍水风险点_symbol", "渍水风险点_line", "渍水风险点_fill"], - "filter": [[],[],[]] + "filter": [[], [], []] }, "尾水路径": { - "layerName": ["hb_wh_dhgx_merge_text", "hb_wh_dhgx_merge_border","hb_wh_dhgx_merge_line_text"], + "layerName": ["hb_wh_dhgx_merge_text", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_line_text"], "filter": [ ["尾水路径_污水处理厂", "尾水路径_泵站", "尾水路径_标注", "尾水路径_净水厂"], - ["尾水路径_路线","尾水路径_路线1", "尾水路径_河道"], - ["尾水路径_路线","尾水路径_路线1", "尾水路径_河道"] + ["尾水路径_路线", "尾水路径_路线1", "尾水路径_河道"], + ["尾水路径_路线", "尾水路径_路线1", "尾水路径_河道"] ] }, - "雨水管网":{"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"]]}, + "雨水管网": { "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": ["linestring"], - "filter": [ - ["污水系统流向1"] - ] + "filter": [["污水系统流向1"]] }, "污水管网1": { "layerName": ["pipeline_info1", "pipeline_point1"], @@ -1643,36 +1778,46 @@ }, "outlet_water_level": { "layerName": ["point"], - "filter": [["outlet_water_level","outlet_water_level_city"]] + "filter": [["outlet_water_level", "outlet_water_level_city"]] }, "outlet_quality": { "layerName": ["point"], - "filter": [["outlet_quality","outlet_quality_city"]] + "filter": [["outlet_quality", "outlet_quality_city"]] + }, + "sewage_pump_station_info": { + "layerName": ["point"], + "filter": [ + [ + "sewage_pump_station_info", + "sewage_pump_station_info_city", + "sewage_pump_station_info_stop", + "sewage_pump_station_info_city_stop" + ] + ] }, - "花山镇":{"layerName": ["村", "村_text"], "filter": [["花山镇"],["花山镇"]]}, - "滨湖街":{"layerName": ["村", "村_text"], "filter": [["滨湖街"],["滨湖街"]]}, - "牛山湖养殖场":{"layerName": ["村", "村_text"], "filter": [["牛山湖养殖场"],["牛山湖养殖场"]]}, - "流芳街":{"layerName": ["村", "村_text"], "filter": [["流芳街"],["流芳街"]]}, - "九峰乡":{"layerName": ["村", "村_text"], "filter": [["九峰乡"],["九峰乡"]]}, - "关东街":{"layerName": ["村", "村_text"], "filter": [["关东街"],["关东街"]]}, - "佛祖岭街":{"layerName": ["村", "村_text"], "filter": [["佛祖岭街"],["佛祖岭街"]]}, - "豹澥镇":{"layerName": ["村", "村_text"], "filter": [["豹澥镇"],["豹澥镇"]]}, - "左岭镇":{"layerName": ["村", "村_text"], "filter": [["左岭镇"],["左岭镇"]]}, - "豹澥湖":{"layerName": ["村", "村_text"], "filter": [["豹澥湖"],["豹澥湖"]]}, + "花山镇": { "layerName": ["村", "村_text"], "filter": [["花山镇"], ["花山镇"]] }, + "滨湖街": { "layerName": ["村", "村_text"], "filter": [["滨湖街"], ["滨湖街"]] }, + "牛山湖养殖场": { "layerName": ["村", "村_text"], "filter": [["牛山湖养殖场"], ["牛山湖养殖场"]] }, + "流芳街": { "layerName": ["村", "村_text"], "filter": [["流芳街"], ["流芳街"]] }, + "九峰乡": { "layerName": ["村", "村_text"], "filter": [["九峰乡"], ["九峰乡"]] }, + "关东街": { "layerName": ["村", "村_text"], "filter": [["关东街"], ["关东街"]] }, + "佛祖岭街": { "layerName": ["村", "村_text"], "filter": [["佛祖岭街"], ["佛祖岭街"]] }, + "豹澥镇": { "layerName": ["村", "村_text"], "filter": [["豹澥镇"], ["豹澥镇"]] }, + "左岭镇": { "layerName": ["村", "村_text"], "filter": [["左岭镇"], ["左岭镇"]] }, + "豹澥湖": { "layerName": ["村", "村_text"], "filter": [["豹澥湖"], ["豹澥湖"]] }, - - "东湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "梁子湖":{"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "严西湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "严家湖":{"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "牛山湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "豹澥湖":{"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "南湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "车墩湖":{"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "汤逊湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "严东湖":{"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "五加湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]} + "东湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "梁子湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "严西湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "严家湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "牛山湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "豹澥湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "南湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "车墩湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "汤逊湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "严东湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "五加湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] } } } diff --git a/index.html b/index.html index 6f7dde6..b1c67fa 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,7 @@ [endif]--> - @@ -217,8 +217,8 @@ opacity: 0.5; } - .l7-popup-content{ - background:rgba(0,0,0,0) !important; + .l7-popup-content { + background: rgba(0, 0, 0, 0) !important; } diff --git a/public/static/libs/mapbox/images/stop.png b/public/static/libs/mapbox/images/stop.png new file mode 100644 index 0000000..6465f03 --- /dev/null +++ b/public/static/libs/mapbox/images/stop.png Binary files differ diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index 3a5727f..e876e85 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -56,6 +56,7 @@ "pine1-lod2": "https://supermap0.wh-nf.cn:8090/resource/glb/pine1-lod2.glb" }, "images": [ + {"name": "stop", "url": "/static/libs/mapbox/images/stop.png"}, {"name": "水库水位@2x", "url": "/static/libs/mapbox/images/水库水位@2x.png"}, {"name": "污水处理站", "url": "/static/libs/mapbox/images/污水处理站.png"}, {"name": "堤防备料@2x", "url": "/static/libs/mapbox/images/堤防备料@2x.png"}, @@ -1200,6 +1201,9 @@ "waterlogging","渍水监测点扎点@2x", "waterlogging_point_info","渍水点扎点@2x", "sewage_pump_station_info","污水泵站扎点@2x", + "sewage_pump_station_info_city","污水泵站扎点@2x", + "sewage_pump_station_info_stop","stop", + "sewage_pump_station_info_city_stop","stop", "sewage_pump_station_info1","污水泵站扎点@2x", "sewage_factory_info","污水处理厂扎点@2x", "channel_water_level","港渠水位扎点@2x", @@ -1591,47 +1595,178 @@ "filter": { "污水分区1": { "layerName": ["hb_wh_dhgx_merge", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_text"], - "filter": [["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"], ["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"],["排水分区_污水分区_1","排水分区_污水分区_2","排水分区_污水分区_3","排水分区_污水分区_4"]] + "filter": [ + ["排水分区_污水分区_1", "排水分区_污水分区_2", "排水分区_污水分区_3", "排水分区_污水分区_4"], + ["排水分区_污水分区_1", "排水分区_污水分区_2", "排水分区_污水分区_3", "排水分区_污水分区_4"], + ["排水分区_污水分区_1", "排水分区_污水分区_2", "排水分区_污水分区_3", "排水分区_污水分区_4"] + ] }, "雨水分区1": { "layerName": ["hb_wh_dhgx_merge", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_text"], - "filter": [["排水分区_雨水分区_1","排水分区_雨水分区_2","排水分区_雨水分区_3","排水分区_雨水分区_4"], ["排水分区_雨水分区_1","排水分区_雨水分区_2","排水分区_雨水分区_3","排水分区_雨水分区_4"],["排水分区_雨水分区_1","排水分区_雨水分区_2","排水分区_雨水分区_3","排水分区_雨水分区_4"]] + "filter": [ + ["排水分区_雨水分区_1", "排水分区_雨水分区_2", "排水分区_雨水分区_3", "排水分区_雨水分区_4"], + ["排水分区_雨水分区_1", "排水分区_雨水分区_2", "排水分区_雨水分区_3", "排水分区_雨水分区_4"], + ["排水分区_雨水分区_1", "排水分区_雨水分区_2", "排水分区_雨水分区_3", "排水分区_雨水分区_4"] + ] }, "污水分区": { "layerName": ["排水分区", "排水分区_text"], - "filter": [["WS1"],["WS1"]] + "filter": [["WS1"], ["WS1"]] }, "雨水分区": { "layerName": ["排水分区", "排水分区_text"], - "filter": [["YS1"],["YS1"]] + "filter": [["YS1"], ["YS1"]] }, "排水分区_close": { "layerName": ["排水分区", "排水分区_text"], "filter": [ - ["WS龙王咀污水系统", "WS荣军2#片", "WS龙王咀片", "WS荣军4#片", "WS荣军1#片", "WS虹景1#片", "WS荣军3#片", "WS鲁巷片", "WS关南片", "WS", "YS1", "YS", "WS民院1#片", "YS豹澥湖汇水区", "WS绣球山片", "WS关南2#片", "YS茶山刘闸3#片", "YS茶山刘", "YS龙王咀", "YS民院闸10#片", "YS民院闸11#片", "YS民院闸6#片", "YS龙王咀2#片", "YS民院闸5#片", "YS民院闸7#片", "YS尾水箱涵片", "WS关东片", "YS民院闸8#片", "YS水蓝郡片", "YS民院闸1#片", "YS民院闸4#片", "YS民院闸3#片", "YS南湖汇水区", "YS民院闸片", "YS龙王咀1#片", "YS茶山刘闸2#片", "YS民院闸2#片", "WS民院片", "WS关南1#片", "WS关南3#片", "WS虹景2#片", "WS关南4#片", "YS民院闸9#片", "YS水蓝郡", "YS尾水箱涵", "YS南湖大道", "YS锦绣良缘", "YS财经政法片", "WS华科片", "WS民院2#片", "YS茶山刘闸4#片", "YS南湖大道片", "YS锦绣良缘片", "WS1", "YS茶山刘闸1#片", "WS荣军片", "WS虹景片", "YS财经政法"], - ["WS龙王咀污水系统", "WS荣军2#片", "WS龙王咀片", "WS荣军4#片", "WS荣军1#片", "WS虹景1#片", "WS荣军3#片", "WS鲁巷片", "WS关南片", "WS", "YS1", "YS", "WS民院1#片", "YS豹澥湖汇水区", "WS绣球山片", "WS关南2#片", "YS茶山刘闸3#片", "YS茶山刘", "YS龙王咀", "YS民院闸10#片", "YS民院闸11#片", "YS民院闸6#片", "YS龙王咀2#片", "YS民院闸5#片", "YS民院闸7#片", "YS尾水箱涵片", "WS关东片", "YS民院闸8#片", "YS水蓝郡片", "YS民院闸1#片", "YS民院闸4#片", "YS民院闸3#片", "YS南湖汇水区", "YS民院闸片", "YS龙王咀1#片", "YS茶山刘闸2#片", "YS民院闸2#片", "WS民院片", "WS关南1#片", "WS关南3#片", "WS虹景2#片", "WS关南4#片", "YS民院闸9#片", "YS水蓝郡", "YS尾水箱涵", "YS南湖大道", "YS锦绣良缘", "YS财经政法片", "WS华科片", "WS民院2#片", "YS茶山刘闸4#片", "YS南湖大道片", "YS锦绣良缘片", "WS1", "YS茶山刘闸1#片", "WS荣军片", "WS虹景片", "YS财经政法"] + [ + "WS龙王咀污水系统", + "WS荣军2#片", + "WS龙王咀片", + "WS荣军4#片", + "WS荣军1#片", + "WS虹景1#片", + "WS荣军3#片", + "WS鲁巷片", + "WS关南片", + "WS", + "YS1", + "YS", + "WS民院1#片", + "YS豹澥湖汇水区", + "WS绣球山片", + "WS关南2#片", + "YS茶山刘闸3#片", + "YS茶山刘", + "YS龙王咀", + "YS民院闸10#片", + "YS民院闸11#片", + "YS民院闸6#片", + "YS龙王咀2#片", + "YS民院闸5#片", + "YS民院闸7#片", + "YS尾水箱涵片", + "WS关东片", + "YS民院闸8#片", + "YS水蓝郡片", + "YS民院闸1#片", + "YS民院闸4#片", + "YS民院闸3#片", + "YS南湖汇水区", + "YS民院闸片", + "YS龙王咀1#片", + "YS茶山刘闸2#片", + "YS民院闸2#片", + "WS民院片", + "WS关南1#片", + "WS关南3#片", + "WS虹景2#片", + "WS关南4#片", + "YS民院闸9#片", + "YS水蓝郡", + "YS尾水箱涵", + "YS南湖大道", + "YS锦绣良缘", + "YS财经政法片", + "WS华科片", + "WS民院2#片", + "YS茶山刘闸4#片", + "YS南湖大道片", + "YS锦绣良缘片", + "WS1", + "YS茶山刘闸1#片", + "WS荣军片", + "WS虹景片", + "YS财经政法" + ], + [ + "WS龙王咀污水系统", + "WS荣军2#片", + "WS龙王咀片", + "WS荣军4#片", + "WS荣军1#片", + "WS虹景1#片", + "WS荣军3#片", + "WS鲁巷片", + "WS关南片", + "WS", + "YS1", + "YS", + "WS民院1#片", + "YS豹澥湖汇水区", + "WS绣球山片", + "WS关南2#片", + "YS茶山刘闸3#片", + "YS茶山刘", + "YS龙王咀", + "YS民院闸10#片", + "YS民院闸11#片", + "YS民院闸6#片", + "YS龙王咀2#片", + "YS民院闸5#片", + "YS民院闸7#片", + "YS尾水箱涵片", + "WS关东片", + "YS民院闸8#片", + "YS水蓝郡片", + "YS民院闸1#片", + "YS民院闸4#片", + "YS民院闸3#片", + "YS南湖汇水区", + "YS民院闸片", + "YS龙王咀1#片", + "YS茶山刘闸2#片", + "YS民院闸2#片", + "WS民院片", + "WS关南1#片", + "WS关南3#片", + "WS虹景2#片", + "WS关南4#片", + "YS民院闸9#片", + "YS水蓝郡", + "YS尾水箱涵", + "YS南湖大道", + "YS锦绣良缘", + "YS财经政法片", + "WS华科片", + "WS民院2#片", + "YS茶山刘闸4#片", + "YS南湖大道片", + "YS锦绣良缘片", + "WS1", + "YS茶山刘闸1#片", + "WS荣军片", + "WS虹景片", + "YS财经政法" + ] ] }, "渍水风险点": { "layerName": ["渍水风险点_symbol", "渍水风险点_line", "渍水风险点_fill"], - "filter": [[],[],[]] + "filter": [[], [], []] }, "尾水路径": { - "layerName": ["hb_wh_dhgx_merge_text", "hb_wh_dhgx_merge_border","hb_wh_dhgx_merge_line_text"], + "layerName": ["hb_wh_dhgx_merge_text", "hb_wh_dhgx_merge_border", "hb_wh_dhgx_merge_line_text"], "filter": [ ["尾水路径_污水处理厂", "尾水路径_泵站", "尾水路径_标注", "尾水路径_净水厂"], - ["尾水路径_路线","尾水路径_路线1", "尾水路径_河道"], - ["尾水路径_路线","尾水路径_路线1", "尾水路径_河道"] + ["尾水路径_路线", "尾水路径_路线1", "尾水路径_河道"], + ["尾水路径_路线", "尾水路径_路线1", "尾水路径_河道"] ] }, - "雨水管网":{"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"]]}, + "雨水管网": { "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": ["linestring"], - "filter": [ - ["污水系统流向1"] - ] + "filter": [["污水系统流向1"]] }, "污水管网1": { "layerName": ["pipeline_info1", "pipeline_point1"], @@ -1643,36 +1778,46 @@ }, "outlet_water_level": { "layerName": ["point"], - "filter": [["outlet_water_level","outlet_water_level_city"]] + "filter": [["outlet_water_level", "outlet_water_level_city"]] }, "outlet_quality": { "layerName": ["point"], - "filter": [["outlet_quality","outlet_quality_city"]] + "filter": [["outlet_quality", "outlet_quality_city"]] + }, + "sewage_pump_station_info": { + "layerName": ["point"], + "filter": [ + [ + "sewage_pump_station_info", + "sewage_pump_station_info_city", + "sewage_pump_station_info_stop", + "sewage_pump_station_info_city_stop" + ] + ] }, - "花山镇":{"layerName": ["村", "村_text"], "filter": [["花山镇"],["花山镇"]]}, - "滨湖街":{"layerName": ["村", "村_text"], "filter": [["滨湖街"],["滨湖街"]]}, - "牛山湖养殖场":{"layerName": ["村", "村_text"], "filter": [["牛山湖养殖场"],["牛山湖养殖场"]]}, - "流芳街":{"layerName": ["村", "村_text"], "filter": [["流芳街"],["流芳街"]]}, - "九峰乡":{"layerName": ["村", "村_text"], "filter": [["九峰乡"],["九峰乡"]]}, - "关东街":{"layerName": ["村", "村_text"], "filter": [["关东街"],["关东街"]]}, - "佛祖岭街":{"layerName": ["村", "村_text"], "filter": [["佛祖岭街"],["佛祖岭街"]]}, - "豹澥镇":{"layerName": ["村", "村_text"], "filter": [["豹澥镇"],["豹澥镇"]]}, - "左岭镇":{"layerName": ["村", "村_text"], "filter": [["左岭镇"],["左岭镇"]]}, - "豹澥湖":{"layerName": ["村", "村_text"], "filter": [["豹澥湖"],["豹澥湖"]]}, + "花山镇": { "layerName": ["村", "村_text"], "filter": [["花山镇"], ["花山镇"]] }, + "滨湖街": { "layerName": ["村", "村_text"], "filter": [["滨湖街"], ["滨湖街"]] }, + "牛山湖养殖场": { "layerName": ["村", "村_text"], "filter": [["牛山湖养殖场"], ["牛山湖养殖场"]] }, + "流芳街": { "layerName": ["村", "村_text"], "filter": [["流芳街"], ["流芳街"]] }, + "九峰乡": { "layerName": ["村", "村_text"], "filter": [["九峰乡"], ["九峰乡"]] }, + "关东街": { "layerName": ["村", "村_text"], "filter": [["关东街"], ["关东街"]] }, + "佛祖岭街": { "layerName": ["村", "村_text"], "filter": [["佛祖岭街"], ["佛祖岭街"]] }, + "豹澥镇": { "layerName": ["村", "村_text"], "filter": [["豹澥镇"], ["豹澥镇"]] }, + "左岭镇": { "layerName": ["村", "村_text"], "filter": [["左岭镇"], ["左岭镇"]] }, + "豹澥湖": { "layerName": ["村", "村_text"], "filter": [["豹澥湖"], ["豹澥湖"]] }, - - "东湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "梁子湖":{"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "严西湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "严家湖":{"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "牛山湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "豹澥湖":{"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "南湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "车墩湖":{"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "汤逊湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "严东湖":{"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}, - "五加湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]} + "东湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "梁子湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "严西湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "严家湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "牛山湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "豹澥湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "南湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "车墩湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "汤逊湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "严东湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] }, + "五加湖": { "layerName": ["港渠", "港渠_text"], "filter": [[], []] } } } diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 1df1977..11fa8d6 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -819,14 +819,7 @@ method: getBaseListPoint, fields: { geometry: "geometry", name: "name" }, groupMethod: (data) => - _.groupBy( - data - .map((i) => i.data) - .flat() - .filter((i) => i.geometry) - .map((item) => ({ ...item, _image: (item.warnList || [])[0] })), - (v) => v.pointType + (v.connectType ? "_" + v.connectType : "") - ), + _.groupBy(data.map((i) => i.data).flat().filter((i) => i.geometry).map((item) => ({ ...item, _image: (item.warnList || [])[0] })), (v) => v.pointType + (v.connectType ? "_" + v.connectType : "")+(v.name.includes('停用')?"_stop":"")), others: { outlet_info: { method: (data) => @@ -838,11 +831,11 @@ }, }, //车辆 - /* cheliang: { + cheliang: { method: supervisionRealinformationList, fields: { lng: "longitude", lat: "latitude", name: "plateNumber" }, groupMethod: (data) => _.groupBy(data.supervisionRealinformationList.filter((i) => i.longitude && i.latitude).map((item) => ({ ...item, type: item.vehicleCategory + item.status })), (v) => v.type), - },*/ + }, }; const other_data_params = {}; let keys = Object.keys(params || data_default_params);