diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 69a645b..961ce31 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -2,14 +2,9 @@ "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": 10, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" @@ -34,16 +29,7 @@ "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": "" @@ -51,9 +37,7 @@ "methods": [ { "name": "addTo", - "params": [ - "''||map" - ] + "params": ["''||map"] }, { "name": "hide", @@ -67,16 +51,7 @@ "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": [] }, @@ -85,12 +60,7 @@ "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`)" @@ -121,9 +91,7 @@ "methods": [ { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "color", @@ -165,21 +133,15 @@ "methods": [ { "name": "size", - "params": [ - 3 - ] + "params": [3] }, { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "texture", - "params": [ - "02" - ] + "params": ["02"] }, { "name": "color", @@ -224,28 +186,19 @@ "methods": [ { "name": "shape", - "params": [ - "circle" - ] + "params": ["circle"] }, { "name": "color", - "params": [ - "rgba(236,223,25,1.0)" - ] + "params": ["rgba(236,223,25,1.0)"] }, { "name": "size", - "params": [ - "size", - "''||function(v){return v}" - ] + "params": ["size", "''||function(v){return v}"] }, { "name": "animate", - "params": [ - true - ] + "params": [true] }, { "name": "style", @@ -269,21 +222,15 @@ "methods": [ { "name": "size", - "params": [ - 3 - ] + "params": [3] }, { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "texture", - "params": [ - "02" - ] + "params": ["02"] }, { "name": "color", @@ -328,27 +275,19 @@ "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", @@ -372,24 +311,17 @@ "methods": [ { "name": "shape", - "params": [ - "map_selected" - ] + "params": ["map_selected"] }, { "name": "size", - "params": [ - 30 - ] + "params": [30] }, { "name": "style", "params": [ { - "offsets": [ - 0, - 0 - ] + "offsets": [0, 0] } ] } @@ -406,21 +338,15 @@ "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)"] } ] } @@ -445,26 +371,9 @@ "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", - "#EAA333", - "#000000" - ], + "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#EAA333", "#000000"], "line-width": 2 }, "layout": {}, @@ -478,16 +387,9 @@ "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, @@ -500,16 +402,9 @@ "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": {}, @@ -523,36 +418,17 @@ "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" @@ -568,11 +444,7 @@ "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)", @@ -581,10 +453,7 @@ "layout": { "icon-image": [ "match", - [ - "get", - "type" - ], + ["get", "type"], "YSBZ", "rainBengZhan_icon", "WSBZ", @@ -614,192 +483,85 @@ "icon-anchor": "center", "icon-size": 0.8, "text-field": "{name}", - "text-font": [ - "KlokanTech Noto Sans Regular" - ], - "text-size": 16, + "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" - ], - [ - "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"], + ["poi_label"], + ["place_label_city"], + ["road_major_label"], + ["place_label_other"], + ["point"] ], "filter": { "wsLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "ws" - ], - [ - "ws" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["ws"], ["ws"]] }, "hsLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "hs" - ], - [ - "hs" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["hs"], ["hs"]] }, "ysLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "ys" - ], - [ - "ys" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["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 69a645b..961ce31 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -2,14 +2,9 @@ "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": 10, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" @@ -34,16 +29,7 @@ "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": "" @@ -51,9 +37,7 @@ "methods": [ { "name": "addTo", - "params": [ - "''||map" - ] + "params": ["''||map"] }, { "name": "hide", @@ -67,16 +51,7 @@ "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": [] }, @@ -85,12 +60,7 @@ "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`)" @@ -121,9 +91,7 @@ "methods": [ { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "color", @@ -165,21 +133,15 @@ "methods": [ { "name": "size", - "params": [ - 3 - ] + "params": [3] }, { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "texture", - "params": [ - "02" - ] + "params": ["02"] }, { "name": "color", @@ -224,28 +186,19 @@ "methods": [ { "name": "shape", - "params": [ - "circle" - ] + "params": ["circle"] }, { "name": "color", - "params": [ - "rgba(236,223,25,1.0)" - ] + "params": ["rgba(236,223,25,1.0)"] }, { "name": "size", - "params": [ - "size", - "''||function(v){return v}" - ] + "params": ["size", "''||function(v){return v}"] }, { "name": "animate", - "params": [ - true - ] + "params": [true] }, { "name": "style", @@ -269,21 +222,15 @@ "methods": [ { "name": "size", - "params": [ - 3 - ] + "params": [3] }, { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "texture", - "params": [ - "02" - ] + "params": ["02"] }, { "name": "color", @@ -328,27 +275,19 @@ "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", @@ -372,24 +311,17 @@ "methods": [ { "name": "shape", - "params": [ - "map_selected" - ] + "params": ["map_selected"] }, { "name": "size", - "params": [ - 30 - ] + "params": [30] }, { "name": "style", "params": [ { - "offsets": [ - 0, - 0 - ] + "offsets": [0, 0] } ] } @@ -406,21 +338,15 @@ "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)"] } ] } @@ -445,26 +371,9 @@ "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", - "#EAA333", - "#000000" - ], + "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#EAA333", "#000000"], "line-width": 2 }, "layout": {}, @@ -478,16 +387,9 @@ "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, @@ -500,16 +402,9 @@ "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": {}, @@ -523,36 +418,17 @@ "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" @@ -568,11 +444,7 @@ "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)", @@ -581,10 +453,7 @@ "layout": { "icon-image": [ "match", - [ - "get", - "type" - ], + ["get", "type"], "YSBZ", "rainBengZhan_icon", "WSBZ", @@ -614,192 +483,85 @@ "icon-anchor": "center", "icon-size": 0.8, "text-field": "{name}", - "text-font": [ - "KlokanTech Noto Sans Regular" - ], - "text-size": 16, + "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" - ], - [ - "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"], + ["poi_label"], + ["place_label_city"], + ["road_major_label"], + ["place_label_other"], + ["point"] ], "filter": { "wsLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "ws" - ], - [ - "ws" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["ws"], ["ws"]] }, "hsLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "hs" - ], - [ - "hs" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["hs"], ["hs"]] }, "ysLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "ys" - ], - [ - "ys" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["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/gisMapPage/gisMapBox.vue b/src/views/gisMapPage/gisMapBox.vue index 4cb6ef1..8207cb6 100644 --- a/src/views/gisMapPage/gisMapBox.vue +++ b/src/views/gisMapPage/gisMapBox.vue @@ -415,6 +415,7 @@ 'text-field': ['get', 'name'], 'text-font': ['KlokanTech Noto Sans Regular'], 'text-transform': 'uppercase', + 'text-size': 12, }, paint: { 'text-halo-color': 'rgba(238, 251, 255,1)', diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 69a645b..961ce31 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -2,14 +2,9 @@ "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": 10, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" @@ -34,16 +29,7 @@ "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": "" @@ -51,9 +37,7 @@ "methods": [ { "name": "addTo", - "params": [ - "''||map" - ] + "params": ["''||map"] }, { "name": "hide", @@ -67,16 +51,7 @@ "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": [] }, @@ -85,12 +60,7 @@ "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`)" @@ -121,9 +91,7 @@ "methods": [ { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "color", @@ -165,21 +133,15 @@ "methods": [ { "name": "size", - "params": [ - 3 - ] + "params": [3] }, { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "texture", - "params": [ - "02" - ] + "params": ["02"] }, { "name": "color", @@ -224,28 +186,19 @@ "methods": [ { "name": "shape", - "params": [ - "circle" - ] + "params": ["circle"] }, { "name": "color", - "params": [ - "rgba(236,223,25,1.0)" - ] + "params": ["rgba(236,223,25,1.0)"] }, { "name": "size", - "params": [ - "size", - "''||function(v){return v}" - ] + "params": ["size", "''||function(v){return v}"] }, { "name": "animate", - "params": [ - true - ] + "params": [true] }, { "name": "style", @@ -269,21 +222,15 @@ "methods": [ { "name": "size", - "params": [ - 3 - ] + "params": [3] }, { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "texture", - "params": [ - "02" - ] + "params": ["02"] }, { "name": "color", @@ -328,27 +275,19 @@ "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", @@ -372,24 +311,17 @@ "methods": [ { "name": "shape", - "params": [ - "map_selected" - ] + "params": ["map_selected"] }, { "name": "size", - "params": [ - 30 - ] + "params": [30] }, { "name": "style", "params": [ { - "offsets": [ - 0, - 0 - ] + "offsets": [0, 0] } ] } @@ -406,21 +338,15 @@ "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)"] } ] } @@ -445,26 +371,9 @@ "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", - "#EAA333", - "#000000" - ], + "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#EAA333", "#000000"], "line-width": 2 }, "layout": {}, @@ -478,16 +387,9 @@ "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, @@ -500,16 +402,9 @@ "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": {}, @@ -523,36 +418,17 @@ "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" @@ -568,11 +444,7 @@ "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)", @@ -581,10 +453,7 @@ "layout": { "icon-image": [ "match", - [ - "get", - "type" - ], + ["get", "type"], "YSBZ", "rainBengZhan_icon", "WSBZ", @@ -614,192 +483,85 @@ "icon-anchor": "center", "icon-size": 0.8, "text-field": "{name}", - "text-font": [ - "KlokanTech Noto Sans Regular" - ], - "text-size": 16, + "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" - ], - [ - "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"], + ["poi_label"], + ["place_label_city"], + ["road_major_label"], + ["place_label_other"], + ["point"] ], "filter": { "wsLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "ws" - ], - [ - "ws" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["ws"], ["ws"]] }, "hsLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "hs" - ], - [ - "hs" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["hs"], ["hs"]] }, "ysLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "ys" - ], - [ - "ys" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["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/gisMapPage/gisMapBox.vue b/src/views/gisMapPage/gisMapBox.vue index 4cb6ef1..8207cb6 100644 --- a/src/views/gisMapPage/gisMapBox.vue +++ b/src/views/gisMapPage/gisMapBox.vue @@ -415,6 +415,7 @@ 'text-field': ['get', 'name'], 'text-font': ['KlokanTech Noto Sans Regular'], 'text-transform': 'uppercase', + 'text-size': 12, }, paint: { 'text-halo-color': 'rgba(238, 251, 255,1)', diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 39a9854..9d554a5 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -415,6 +415,7 @@ 'text-field': ['get', 'name'], 'text-font': ['KlokanTech Noto Sans Regular'], 'text-transform': 'uppercase', + 'text-size': 12, }, paint: { 'text-halo-color': 'rgba(238, 251, 255,1)', diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 69a645b..961ce31 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -2,14 +2,9 @@ "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": 10, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" @@ -34,16 +29,7 @@ "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": "" @@ -51,9 +37,7 @@ "methods": [ { "name": "addTo", - "params": [ - "''||map" - ] + "params": ["''||map"] }, { "name": "hide", @@ -67,16 +51,7 @@ "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": [] }, @@ -85,12 +60,7 @@ "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`)" @@ -121,9 +91,7 @@ "methods": [ { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "color", @@ -165,21 +133,15 @@ "methods": [ { "name": "size", - "params": [ - 3 - ] + "params": [3] }, { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "texture", - "params": [ - "02" - ] + "params": ["02"] }, { "name": "color", @@ -224,28 +186,19 @@ "methods": [ { "name": "shape", - "params": [ - "circle" - ] + "params": ["circle"] }, { "name": "color", - "params": [ - "rgba(236,223,25,1.0)" - ] + "params": ["rgba(236,223,25,1.0)"] }, { "name": "size", - "params": [ - "size", - "''||function(v){return v}" - ] + "params": ["size", "''||function(v){return v}"] }, { "name": "animate", - "params": [ - true - ] + "params": [true] }, { "name": "style", @@ -269,21 +222,15 @@ "methods": [ { "name": "size", - "params": [ - 3 - ] + "params": [3] }, { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "texture", - "params": [ - "02" - ] + "params": ["02"] }, { "name": "color", @@ -328,27 +275,19 @@ "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", @@ -372,24 +311,17 @@ "methods": [ { "name": "shape", - "params": [ - "map_selected" - ] + "params": ["map_selected"] }, { "name": "size", - "params": [ - 30 - ] + "params": [30] }, { "name": "style", "params": [ { - "offsets": [ - 0, - 0 - ] + "offsets": [0, 0] } ] } @@ -406,21 +338,15 @@ "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)"] } ] } @@ -445,26 +371,9 @@ "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", - "#EAA333", - "#000000" - ], + "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#EAA333", "#000000"], "line-width": 2 }, "layout": {}, @@ -478,16 +387,9 @@ "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, @@ -500,16 +402,9 @@ "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": {}, @@ -523,36 +418,17 @@ "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" @@ -568,11 +444,7 @@ "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)", @@ -581,10 +453,7 @@ "layout": { "icon-image": [ "match", - [ - "get", - "type" - ], + ["get", "type"], "YSBZ", "rainBengZhan_icon", "WSBZ", @@ -614,192 +483,85 @@ "icon-anchor": "center", "icon-size": 0.8, "text-field": "{name}", - "text-font": [ - "KlokanTech Noto Sans Regular" - ], - "text-size": 16, + "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" - ], - [ - "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"], + ["poi_label"], + ["place_label_city"], + ["road_major_label"], + ["place_label_other"], + ["point"] ], "filter": { "wsLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "ws" - ], - [ - "ws" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["ws"], ["ws"]] }, "hsLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "hs" - ], - [ - "hs" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["hs"], ["hs"]] }, "ysLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "ys" - ], - [ - "ys" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["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/gisMapPage/gisMapBox.vue b/src/views/gisMapPage/gisMapBox.vue index 4cb6ef1..8207cb6 100644 --- a/src/views/gisMapPage/gisMapBox.vue +++ b/src/views/gisMapPage/gisMapBox.vue @@ -415,6 +415,7 @@ 'text-field': ['get', 'name'], 'text-font': ['KlokanTech Noto Sans Regular'], 'text-transform': 'uppercase', + 'text-size': 12, }, paint: { 'text-halo-color': 'rgba(238, 251, 255,1)', diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 39a9854..9d554a5 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -415,6 +415,7 @@ 'text-field': ['get', 'name'], 'text-font': ['KlokanTech Noto Sans Regular'], 'text-transform': 'uppercase', + 'text-size': 12, }, paint: { 'text-halo-color': 'rgba(238, 251, 255,1)', diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index f89fa97..43acf07 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -147,8 +147,8 @@ bus.emit('closeCesiumPopup'); // 关闭之后回到中心点 newfiberMapbox.map.easeTo({ - center: [114.35, 34.802], - zoom: 12.9, + center: [114.344, 34.802], + zoom: 13.6, pitch: 55, }); } diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 69a645b..961ce31 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -2,14 +2,9 @@ "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": 10, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" @@ -34,16 +29,7 @@ "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": "" @@ -51,9 +37,7 @@ "methods": [ { "name": "addTo", - "params": [ - "''||map" - ] + "params": ["''||map"] }, { "name": "hide", @@ -67,16 +51,7 @@ "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": [] }, @@ -85,12 +60,7 @@ "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`)" @@ -121,9 +91,7 @@ "methods": [ { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "color", @@ -165,21 +133,15 @@ "methods": [ { "name": "size", - "params": [ - 3 - ] + "params": [3] }, { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "texture", - "params": [ - "02" - ] + "params": ["02"] }, { "name": "color", @@ -224,28 +186,19 @@ "methods": [ { "name": "shape", - "params": [ - "circle" - ] + "params": ["circle"] }, { "name": "color", - "params": [ - "rgba(236,223,25,1.0)" - ] + "params": ["rgba(236,223,25,1.0)"] }, { "name": "size", - "params": [ - "size", - "''||function(v){return v}" - ] + "params": ["size", "''||function(v){return v}"] }, { "name": "animate", - "params": [ - true - ] + "params": [true] }, { "name": "style", @@ -269,21 +222,15 @@ "methods": [ { "name": "size", - "params": [ - 3 - ] + "params": [3] }, { "name": "shape", - "params": [ - "line" - ] + "params": ["line"] }, { "name": "texture", - "params": [ - "02" - ] + "params": ["02"] }, { "name": "color", @@ -328,27 +275,19 @@ "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", @@ -372,24 +311,17 @@ "methods": [ { "name": "shape", - "params": [ - "map_selected" - ] + "params": ["map_selected"] }, { "name": "size", - "params": [ - 30 - ] + "params": [30] }, { "name": "style", "params": [ { - "offsets": [ - 0, - 0 - ] + "offsets": [0, 0] } ] } @@ -406,21 +338,15 @@ "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)"] } ] } @@ -445,26 +371,9 @@ "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", - "#EAA333", - "#000000" - ], + "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#EAA333", "#000000"], "line-width": 2 }, "layout": {}, @@ -478,16 +387,9 @@ "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, @@ -500,16 +402,9 @@ "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": {}, @@ -523,36 +418,17 @@ "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" @@ -568,11 +444,7 @@ "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)", @@ -581,10 +453,7 @@ "layout": { "icon-image": [ "match", - [ - "get", - "type" - ], + ["get", "type"], "YSBZ", "rainBengZhan_icon", "WSBZ", @@ -614,192 +483,85 @@ "icon-anchor": "center", "icon-size": 0.8, "text-field": "{name}", - "text-font": [ - "KlokanTech Noto Sans Regular" - ], - "text-size": 16, + "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" - ], - [ - "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"], + ["poi_label"], + ["place_label_city"], + ["road_major_label"], + ["place_label_other"], + ["point"] ], "filter": { "wsLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "ws" - ], - [ - "ws" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["ws"], ["ws"]] }, "hsLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "hs" - ], - [ - "hs" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["hs"], ["hs"]] }, "ysLine1": { - "layerName": [ - "pipeline_info", - "pipeline_point" - ], - "filter": [ - [ - "ys" - ], - [ - "ys" - ] - ] + "layerName": ["pipeline_info", "pipeline_point"], + "filter": [["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/gisMapPage/gisMapBox.vue b/src/views/gisMapPage/gisMapBox.vue index 4cb6ef1..8207cb6 100644 --- a/src/views/gisMapPage/gisMapBox.vue +++ b/src/views/gisMapPage/gisMapBox.vue @@ -415,6 +415,7 @@ 'text-field': ['get', 'name'], 'text-font': ['KlokanTech Noto Sans Regular'], 'text-transform': 'uppercase', + 'text-size': 12, }, paint: { 'text-halo-color': 'rgba(238, 251, 255,1)', diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 39a9854..9d554a5 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -415,6 +415,7 @@ 'text-field': ['get', 'name'], 'text-font': ['KlokanTech Noto Sans Regular'], 'text-transform': 'uppercase', + 'text-size': 12, }, paint: { 'text-halo-color': 'rgba(238, 251, 255,1)', diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index f89fa97..43acf07 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -147,8 +147,8 @@ bus.emit('closeCesiumPopup'); // 关闭之后回到中心点 newfiberMapbox.map.easeTo({ - center: [114.35, 34.802], - zoom: 12.9, + center: [114.344, 34.802], + zoom: 13.6, pitch: 55, }); } diff --git a/src/views/sponeScreen/waterFlood/futureRain.vue b/src/views/sponeScreen/waterFlood/futureRain.vue index 7b2ee14..5dec06e 100644 --- a/src/views/sponeScreen/waterFlood/futureRain.vue +++ b/src/views/sponeScreen/waterFlood/futureRain.vue @@ -2,7 +2,7 @@
渍水风险预报
+积水风险预报
渍水风险预报
+积水风险预报
渍水风险预报
+积水风险预报