diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index ddc74d0..b572a5f 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -2,9 +2,14 @@ "params": { "basemap": "https://supermap2.wh-nf.cn:8090/bm", "mvt": "https://supermap0.wh-nf.cn:8090/vt", - "sprites": ["/static/libs/mapbox/style/sprite/sprite5"], + "sprites": [ + "/static/libs/mapbox/style/sprite/sprite5" + ], "init": { - "center": [114.315, 34.852], + "center": [ + 114.315, + 34.852 + ], "zoom": 10.4, "pitch": 30, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" @@ -29,7 +34,16 @@ "params": { "id": "newfiber-XYZLayer", "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa", - "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"], + "subdomains": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7" + ], "minZoom": 1, "maxZoom": 19, "tileType": "" @@ -37,7 +51,9 @@ "methods": [ { "name": "addTo", - "params": ["''||map"] + "params": [ + "''||map" + ] }, { "name": "hide", @@ -51,7 +67,16 @@ "params": { "id": "newfiber-WMTSLayer", "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87", - "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"] + "subdomains": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7" + ] }, "methods": [] }, @@ -60,7 +85,12 @@ "type": "CanvasLayer", "params": { "id": "newfiber-CanvasLayer", - "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255], + "bbox": [ + 110.98300209463804, + 32.415967161418266, + 111.34992583909221, + 32.599933881244255 + ], "width": 3000, "height": 1172, "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)" @@ -91,7 +121,9 @@ "methods": [ { "name": "shape", - "params": ["line"] + "params": [ + "line" + ] }, { "name": "color", @@ -133,15 +165,21 @@ "methods": [ { "name": "size", - "params": [4] + "params": [ + 4 + ] }, { "name": "shape", - "params": ["line"] + "params": [ + "line" + ] }, { "name": "texture", - "params": ["02"] + "params": [ + "02" + ] }, { "name": "color", @@ -186,19 +224,28 @@ "methods": [ { "name": "shape", - "params": ["circle"] + "params": [ + "circle" + ] }, { "name": "color", - "params": ["rgba(236,223,25,1.0)"] + "params": [ + "#e74133" + ] }, { "name": "size", - "params": ["size", "''||function(v){return v}"] + "params": [ + "size", + "''||function(v){return v}" + ] }, { "name": "animate", - "params": [true] + "params": [ + true + ] }, { "name": "style", @@ -222,15 +269,21 @@ "methods": [ { "name": "size", - "params": [3] + "params": [ + 3 + ] }, { "name": "shape", - "params": ["line"] + "params": [ + "line" + ] }, { "name": "texture", - "params": ["02"] + "params": [ + "02" + ] }, { "name": "color", @@ -275,19 +328,27 @@ "methods": [ { "name": "shape", - "params": ["circle"] + "params": [ + "circle" + ] }, { "name": "color", - "params": ["rgba(255,0,0,1.0)"] + "params": [ + "rgba(255,0,0,1.0)" + ] }, { "name": "size", - "params": [10] + "params": [ + 10 + ] }, { "name": "animate", - "params": [true] + "params": [ + true + ] }, { "name": "style", @@ -311,17 +372,24 @@ "methods": [ { "name": "shape", - "params": ["map_selected"] + "params": [ + "map_selected" + ] }, { "name": "size", - "params": [30] + "params": [ + 30 + ] }, { "name": "style", "params": [ { - "offsets": [0, 0] + "offsets": [ + 0, + 0 + ] } ] } @@ -338,15 +406,21 @@ "methods": [ { "name": "shape", - "params": ["line"] + "params": [ + "line" + ] }, { "name": "size", - "params": [2] + "params": [ + 2 + ] }, { "name": "color", - "params": ["rgba(189, 209, 150,1)"] + "params": [ + "rgba(189, 209, 150,1)" + ] } ] } @@ -371,9 +445,26 @@ "key": "hn_kf_hm_pipeline", "source-layer": "hn_kf_hm_pipeline", "type": "line", - "filter": ["in", "类型", ""], + "filter": [ + "in", + "类型", + "" + ], "paint": { - "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"], + "line-color": [ + "match", + [ + "get", + "类型" + ], + "ys", + "#1b76ff", + "ws", + "#ff4c61", + "hs", + "#ff80ec", + "#000000" + ], "line-width": 4 }, "layout": {}, @@ -387,15 +478,27 @@ "key": "hn_kf_hm_pipeline", "source-layer": "hn_kf_hm_pipeline", "type": "symbol", - "filter": ["in", "类型", ""], + "filter": [ + "in", + "类型", + "" + ], "layout": { - "text-field": ["get", "管径"], - "text-font": ["KlokanTech Noto Sans Regular"], + "text-field": [ + "get", + "管径" + ], + "text-font": [ + "KlokanTech Noto Sans Regular" + ], "text-rotation-alignment": "map", "text-size": 15, "text-transform": "uppercase", "symbol-placement": "line", - "text-offset": [0, 1.5], + "text-offset": [ + 0, + 1.5 + ], "text-allow-overlap": true, "text-letter-spacing": 1.1 }, @@ -415,7 +518,10 @@ "paint": { "fill-color": [ "match", - ["get", "dlmc"], + [ + "get", + "dlmc" + ], "水浇地", "#fbe5ab", "果园", @@ -508,9 +614,16 @@ "key": "hubei_xiaogan_hm_city_boundary", "source-layer": "hubei_xiaogan_hm_city_boundary", "type": "fill", - "filter": ["in", "name", ""], + "filter": [ + "in", + "name", + "" + ], "paint": { - "fill-color": ["get", "fill_color"] + "fill-color": [ + "get", + "fill_color" + ] }, "layout": {}, "minzoom": 10, @@ -523,9 +636,16 @@ "key": "hubei_xiaogan_hm_psfq", "source-layer": "hubei_xiaogan_hm_psfq", "type": "fill", - "filter": ["in", "type", ""], + "filter": [ + "in", + "type", + "" + ], "paint": { - "fill-color": ["get", "fill_color"], + "fill-color": [ + "get", + "fill_color" + ], "fill-opacity": 0.4 }, "layout": {}, @@ -539,17 +659,36 @@ "key": "hn_kf_hm_pipeline_point", "source-layer": "hn_kf_hm_pipeline_point", "type": "symbol", - "filter": ["in", "类型", ""], + "filter": [ + "in", + "类型", + "" + ], "paint": { "text-color": "rgba(255, 255, 255, 1)", "text-halo-color": "rgba(14, 139, 90, 1)", "text-halo-width": 2 }, "layout": { - "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"], + "icon-image": [ + "match", + [ + "get", + "类型" + ], + "ys", + "ysj", + "ws", + "wsj", + "hs", + "hsj", + "ysbz" + ], "icon-size": 0.5, "text-field": "{管线点号}", - "text-font": ["KlokanTech Noto Sans Regular"], + "text-font": [ + "KlokanTech Noto Sans Regular" + ], "text-size": 13, "text-line-height": 3, "text-anchor": "top" @@ -565,7 +704,11 @@ "type": "symbol", "minzoom": 0, "maxzoom": 24, - "filter": ["in", "type", ""], + "filter": [ + "in", + "type", + "" + ], "paint": { "text-color": "rgba(255, 255, 255, 1)", "text-halo-color": "rgba(14, 139, 90, 1)", @@ -574,7 +717,12 @@ "layout": { "icon-image": [ "match", - ["get", "type"], + [ + "get", + "type" + ], + "warning_monitor", + "warning_monitor", "YSBZ", "rainBengZhan_icon", "WSBZ", @@ -604,86 +752,207 @@ "icon-anchor": "center", "icon-size": 0.8, "text-field": "{name}", - "text-font": ["KlokanTech Noto Sans Regular"], + "text-font": [ + "KlokanTech Noto Sans Regular" + ], "text-size": 15, "text-line-height": 3, "text-anchor": "bottom", "text-max-width": 50, - "text-offset": [0, 3] + "text-offset": [ + 0, + 3 + ] }, "mType": "geojson" } ], "orders": [ - ["newfiber-XYZLayer"], - ["hubei_xiaogan_hm_psfq"], - ["city_boundary"], - ["all_boundary"], - ["pipeline_info"], - ["pipeline_point"], - ["pipeLineLabel"], - ["poi_label"], - ["place_label_city"], - ["road_major_label"], - ["place_label_other"], - ["point"] + [ + "newfiber-XYZLayer" + ], + [ + "hubei_xiaogan_hm_psfq" + ], + [ + "city_boundary" + ], + [ + "all_boundary" + ], + [ + "pipeline_info" + ], + [ + "pipeline_point" + ], + [ + "pipeLineLabel" + ], + [ + "poi_label" + ], + [ + "place_label_city" + ], + [ + "road_major_label" + ], + [ + "place_label_other" + ], + [ + "point" + ] ], "filter": { "wsLine1": { - "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"], - "filter": [["ws"], ["ws"], ["ws"]] + "layerName": [ + "pipeline_info", + "pipeline_point", + "pipeLineLabel" + ], + "filter": [ + [ + "ws" + ], + [ + "ws" + ], + [ + "ws" + ] + ] }, "hsLine1": { - "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"], - "filter": [["hs"], ["hs"], ["hs"]] + "layerName": [ + "pipeline_info", + "pipeline_point", + "pipeLineLabel" + ], + "filter": [ + [ + "hs" + ], + [ + "hs" + ], + [ + "hs" + ] + ] }, "ysLine1": { - "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"], - "filter": [["ys"], ["ys"], ["ys"]] + "layerName": [ + "pipeline_info", + "pipeline_point", + "pipeLineLabel" + ], + "filter": [ + [ + "ys" + ], + [ + "ys" + ], + [ + "ys" + ] + ] }, "YSFQ": { - "layerName": ["hubei_xiaogan_hm_psfq"], - "filter": [["YS"]] + "layerName": [ + "hubei_xiaogan_hm_psfq" + ], + "filter": [ + [ + "YS" + ] + ] }, "WSFQ": { - "layerName": ["hubei_xiaogan_hm_psfq"], - "filter": [["WS"]] + "layerName": [ + "hubei_xiaogan_hm_psfq" + ], + "filter": [ + [ + "WS" + ] + ] }, "oldCity": { - "layerName": ["city_boundary"], - "filter": [["老城区"]], + "layerName": [ + "city_boundary" + ], + "filter": [ + [ + "老城区" + ] + ], "easeTo": { - "center": [113.933, 30.926], + "center": [ + 113.933, + 30.926 + ], "zoom": 13.6, "pitch": 55 } }, "southCity": { - "layerName": ["city_boundary"], - "filter": [["南城新区"]], + "layerName": [ + "city_boundary" + ], + "filter": [ + [ + "南城新区" + ] + ], "easeTo": { - "center": [113.933, 30.886], + "center": [ + 113.933, + 30.886 + ], "zoom": 13.6, "pitch": 55 } }, "newCity": { - "layerName": ["city_boundary"], - "filter": [["东城新区"]], + "layerName": [ + "city_boundary" + ], + "filter": [ + [ + "东城新区" + ] + ], "easeTo": { - "center": [113.983, 30.896], + "center": [ + 113.983, + 30.896 + ], "zoom": 13.6, "pitch": 55 } }, "allCity": { - "layerName": ["city_boundary"], - "filter": [["东城新区", "南城新区", "老城区"]], + "layerName": [ + "city_boundary" + ], + "filter": [ + [ + "东城新区", + "南城新区", + "老城区" + ] + ], "easeTo": { - "center": [113.953, 30.906], + "center": [ + 113.953, + 30.906 + ], "zoom": 13.6, "pitch": 55 } } } -} +} \ No newline at end of file diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index ddc74d0..b572a5f 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -2,9 +2,14 @@ "params": { "basemap": "https://supermap2.wh-nf.cn:8090/bm", "mvt": "https://supermap0.wh-nf.cn:8090/vt", - "sprites": ["/static/libs/mapbox/style/sprite/sprite5"], + "sprites": [ + "/static/libs/mapbox/style/sprite/sprite5" + ], "init": { - "center": [114.315, 34.852], + "center": [ + 114.315, + 34.852 + ], "zoom": 10.4, "pitch": 30, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" @@ -29,7 +34,16 @@ "params": { "id": "newfiber-XYZLayer", "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa", - "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"], + "subdomains": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7" + ], "minZoom": 1, "maxZoom": 19, "tileType": "" @@ -37,7 +51,9 @@ "methods": [ { "name": "addTo", - "params": ["''||map"] + "params": [ + "''||map" + ] }, { "name": "hide", @@ -51,7 +67,16 @@ "params": { "id": "newfiber-WMTSLayer", "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87", - "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"] + "subdomains": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7" + ] }, "methods": [] }, @@ -60,7 +85,12 @@ "type": "CanvasLayer", "params": { "id": "newfiber-CanvasLayer", - "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255], + "bbox": [ + 110.98300209463804, + 32.415967161418266, + 111.34992583909221, + 32.599933881244255 + ], "width": 3000, "height": 1172, "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)" @@ -91,7 +121,9 @@ "methods": [ { "name": "shape", - "params": ["line"] + "params": [ + "line" + ] }, { "name": "color", @@ -133,15 +165,21 @@ "methods": [ { "name": "size", - "params": [4] + "params": [ + 4 + ] }, { "name": "shape", - "params": ["line"] + "params": [ + "line" + ] }, { "name": "texture", - "params": ["02"] + "params": [ + "02" + ] }, { "name": "color", @@ -186,19 +224,28 @@ "methods": [ { "name": "shape", - "params": ["circle"] + "params": [ + "circle" + ] }, { "name": "color", - "params": ["rgba(236,223,25,1.0)"] + "params": [ + "#e74133" + ] }, { "name": "size", - "params": ["size", "''||function(v){return v}"] + "params": [ + "size", + "''||function(v){return v}" + ] }, { "name": "animate", - "params": [true] + "params": [ + true + ] }, { "name": "style", @@ -222,15 +269,21 @@ "methods": [ { "name": "size", - "params": [3] + "params": [ + 3 + ] }, { "name": "shape", - "params": ["line"] + "params": [ + "line" + ] }, { "name": "texture", - "params": ["02"] + "params": [ + "02" + ] }, { "name": "color", @@ -275,19 +328,27 @@ "methods": [ { "name": "shape", - "params": ["circle"] + "params": [ + "circle" + ] }, { "name": "color", - "params": ["rgba(255,0,0,1.0)"] + "params": [ + "rgba(255,0,0,1.0)" + ] }, { "name": "size", - "params": [10] + "params": [ + 10 + ] }, { "name": "animate", - "params": [true] + "params": [ + true + ] }, { "name": "style", @@ -311,17 +372,24 @@ "methods": [ { "name": "shape", - "params": ["map_selected"] + "params": [ + "map_selected" + ] }, { "name": "size", - "params": [30] + "params": [ + 30 + ] }, { "name": "style", "params": [ { - "offsets": [0, 0] + "offsets": [ + 0, + 0 + ] } ] } @@ -338,15 +406,21 @@ "methods": [ { "name": "shape", - "params": ["line"] + "params": [ + "line" + ] }, { "name": "size", - "params": [2] + "params": [ + 2 + ] }, { "name": "color", - "params": ["rgba(189, 209, 150,1)"] + "params": [ + "rgba(189, 209, 150,1)" + ] } ] } @@ -371,9 +445,26 @@ "key": "hn_kf_hm_pipeline", "source-layer": "hn_kf_hm_pipeline", "type": "line", - "filter": ["in", "类型", ""], + "filter": [ + "in", + "类型", + "" + ], "paint": { - "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"], + "line-color": [ + "match", + [ + "get", + "类型" + ], + "ys", + "#1b76ff", + "ws", + "#ff4c61", + "hs", + "#ff80ec", + "#000000" + ], "line-width": 4 }, "layout": {}, @@ -387,15 +478,27 @@ "key": "hn_kf_hm_pipeline", "source-layer": "hn_kf_hm_pipeline", "type": "symbol", - "filter": ["in", "类型", ""], + "filter": [ + "in", + "类型", + "" + ], "layout": { - "text-field": ["get", "管径"], - "text-font": ["KlokanTech Noto Sans Regular"], + "text-field": [ + "get", + "管径" + ], + "text-font": [ + "KlokanTech Noto Sans Regular" + ], "text-rotation-alignment": "map", "text-size": 15, "text-transform": "uppercase", "symbol-placement": "line", - "text-offset": [0, 1.5], + "text-offset": [ + 0, + 1.5 + ], "text-allow-overlap": true, "text-letter-spacing": 1.1 }, @@ -415,7 +518,10 @@ "paint": { "fill-color": [ "match", - ["get", "dlmc"], + [ + "get", + "dlmc" + ], "水浇地", "#fbe5ab", "果园", @@ -508,9 +614,16 @@ "key": "hubei_xiaogan_hm_city_boundary", "source-layer": "hubei_xiaogan_hm_city_boundary", "type": "fill", - "filter": ["in", "name", ""], + "filter": [ + "in", + "name", + "" + ], "paint": { - "fill-color": ["get", "fill_color"] + "fill-color": [ + "get", + "fill_color" + ] }, "layout": {}, "minzoom": 10, @@ -523,9 +636,16 @@ "key": "hubei_xiaogan_hm_psfq", "source-layer": "hubei_xiaogan_hm_psfq", "type": "fill", - "filter": ["in", "type", ""], + "filter": [ + "in", + "type", + "" + ], "paint": { - "fill-color": ["get", "fill_color"], + "fill-color": [ + "get", + "fill_color" + ], "fill-opacity": 0.4 }, "layout": {}, @@ -539,17 +659,36 @@ "key": "hn_kf_hm_pipeline_point", "source-layer": "hn_kf_hm_pipeline_point", "type": "symbol", - "filter": ["in", "类型", ""], + "filter": [ + "in", + "类型", + "" + ], "paint": { "text-color": "rgba(255, 255, 255, 1)", "text-halo-color": "rgba(14, 139, 90, 1)", "text-halo-width": 2 }, "layout": { - "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"], + "icon-image": [ + "match", + [ + "get", + "类型" + ], + "ys", + "ysj", + "ws", + "wsj", + "hs", + "hsj", + "ysbz" + ], "icon-size": 0.5, "text-field": "{管线点号}", - "text-font": ["KlokanTech Noto Sans Regular"], + "text-font": [ + "KlokanTech Noto Sans Regular" + ], "text-size": 13, "text-line-height": 3, "text-anchor": "top" @@ -565,7 +704,11 @@ "type": "symbol", "minzoom": 0, "maxzoom": 24, - "filter": ["in", "type", ""], + "filter": [ + "in", + "type", + "" + ], "paint": { "text-color": "rgba(255, 255, 255, 1)", "text-halo-color": "rgba(14, 139, 90, 1)", @@ -574,7 +717,12 @@ "layout": { "icon-image": [ "match", - ["get", "type"], + [ + "get", + "type" + ], + "warning_monitor", + "warning_monitor", "YSBZ", "rainBengZhan_icon", "WSBZ", @@ -604,86 +752,207 @@ "icon-anchor": "center", "icon-size": 0.8, "text-field": "{name}", - "text-font": ["KlokanTech Noto Sans Regular"], + "text-font": [ + "KlokanTech Noto Sans Regular" + ], "text-size": 15, "text-line-height": 3, "text-anchor": "bottom", "text-max-width": 50, - "text-offset": [0, 3] + "text-offset": [ + 0, + 3 + ] }, "mType": "geojson" } ], "orders": [ - ["newfiber-XYZLayer"], - ["hubei_xiaogan_hm_psfq"], - ["city_boundary"], - ["all_boundary"], - ["pipeline_info"], - ["pipeline_point"], - ["pipeLineLabel"], - ["poi_label"], - ["place_label_city"], - ["road_major_label"], - ["place_label_other"], - ["point"] + [ + "newfiber-XYZLayer" + ], + [ + "hubei_xiaogan_hm_psfq" + ], + [ + "city_boundary" + ], + [ + "all_boundary" + ], + [ + "pipeline_info" + ], + [ + "pipeline_point" + ], + [ + "pipeLineLabel" + ], + [ + "poi_label" + ], + [ + "place_label_city" + ], + [ + "road_major_label" + ], + [ + "place_label_other" + ], + [ + "point" + ] ], "filter": { "wsLine1": { - "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"], - "filter": [["ws"], ["ws"], ["ws"]] + "layerName": [ + "pipeline_info", + "pipeline_point", + "pipeLineLabel" + ], + "filter": [ + [ + "ws" + ], + [ + "ws" + ], + [ + "ws" + ] + ] }, "hsLine1": { - "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"], - "filter": [["hs"], ["hs"], ["hs"]] + "layerName": [ + "pipeline_info", + "pipeline_point", + "pipeLineLabel" + ], + "filter": [ + [ + "hs" + ], + [ + "hs" + ], + [ + "hs" + ] + ] }, "ysLine1": { - "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"], - "filter": [["ys"], ["ys"], ["ys"]] + "layerName": [ + "pipeline_info", + "pipeline_point", + "pipeLineLabel" + ], + "filter": [ + [ + "ys" + ], + [ + "ys" + ], + [ + "ys" + ] + ] }, "YSFQ": { - "layerName": ["hubei_xiaogan_hm_psfq"], - "filter": [["YS"]] + "layerName": [ + "hubei_xiaogan_hm_psfq" + ], + "filter": [ + [ + "YS" + ] + ] }, "WSFQ": { - "layerName": ["hubei_xiaogan_hm_psfq"], - "filter": [["WS"]] + "layerName": [ + "hubei_xiaogan_hm_psfq" + ], + "filter": [ + [ + "WS" + ] + ] }, "oldCity": { - "layerName": ["city_boundary"], - "filter": [["老城区"]], + "layerName": [ + "city_boundary" + ], + "filter": [ + [ + "老城区" + ] + ], "easeTo": { - "center": [113.933, 30.926], + "center": [ + 113.933, + 30.926 + ], "zoom": 13.6, "pitch": 55 } }, "southCity": { - "layerName": ["city_boundary"], - "filter": [["南城新区"]], + "layerName": [ + "city_boundary" + ], + "filter": [ + [ + "南城新区" + ] + ], "easeTo": { - "center": [113.933, 30.886], + "center": [ + 113.933, + 30.886 + ], "zoom": 13.6, "pitch": 55 } }, "newCity": { - "layerName": ["city_boundary"], - "filter": [["东城新区"]], + "layerName": [ + "city_boundary" + ], + "filter": [ + [ + "东城新区" + ] + ], "easeTo": { - "center": [113.983, 30.896], + "center": [ + 113.983, + 30.896 + ], "zoom": 13.6, "pitch": 55 } }, "allCity": { - "layerName": ["city_boundary"], - "filter": [["东城新区", "南城新区", "老城区"]], + "layerName": [ + "city_boundary" + ], + "filter": [ + [ + "东城新区", + "南城新区", + "老城区" + ] + ], "easeTo": { - "center": [113.953, 30.906], + "center": [ + 113.953, + 30.906 + ], "zoom": 13.6, "pitch": 55 } } } -} +} \ No newline at end of file diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue index c957867..0016a84 100644 --- a/src/views/sponeScreen/waterFlood/index.vue +++ b/src/views/sponeScreen/waterFlood/index.vue @@ -95,6 +95,23 @@ let datas = res.data || []; if (datas.length > 0) { // 渲染报警图层 + console.log('datas-----', datas); + let warningFeatures = []; + datas.forEach(element => { + let warningFeature = turf.point(element.lonLat.split(',').map(Number), element); + warningFeature.properties.size = 1000; + warningFeature.properties.stName = ''; + warningFeatures.push(warningFeature); + }); + let warningGeojson = turf.featureCollection(warningFeatures); + let key = 'warning_monitor'; + bus.emit('getGeojsonByType', { + type: key, + callback: geojson => { + if (!!!geojson.features.length) bus.emit('setGeoJSON', { json: warningGeojson, key: 'warning_monitor' }); + bus.emit('setLayerVisible', { layername: key, isCheck: true }); + }, + }); } }); } @@ -192,11 +209,8 @@ }, ]); }, 1200); - // 实时报警 - nextTick(() => { - realDataWarn(); - }); + realDataWarn(); }); onBeforeUnmount(() => { bus.off('checkBZGYT');