diff --git a/public/static/libs/mapbox/images/1.jpg b/public/static/libs/mapbox/images/1.jpg new file mode 100644 index 0000000..fcf018d --- /dev/null +++ b/public/static/libs/mapbox/images/1.jpg Binary files differ diff --git a/public/static/libs/mapbox/images/1.jpg b/public/static/libs/mapbox/images/1.jpg new file mode 100644 index 0000000..fcf018d --- /dev/null +++ b/public/static/libs/mapbox/images/1.jpg Binary files differ diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ea5cc9d..f06424f 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,14 +1,14 @@ { "params": { "basemap": "https://supermap2.wh-nf.cn:8090/bm", - "mvt": "https://supermap0.wh-nf.cn:8090/vt/mvt", + "mvt": "https://supermap0.wh-nf.cn:8090/vt/v1/mvt", "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], "init": { - "center": [114.46005135362464, 30.43882434475003], - "zoom": 10.8, + "center": [114.40776390595016, 30.484477581887262], + "zoom": 11.3, "maxZoom": 20.9, "minZoom": 1, "pitch": 0, @@ -52,7 +52,7 @@ {"name": "full_out", "url": "/static/libs/mapbox/images/full_out.png"}, {"name": "full_out_risk", "url": "/static/libs/mapbox/images/full_out_risk.png"}, {"name": "排渍调度", "url": "/static/libs/mapbox/images/排渍调度.png"}, - {"name": "material5", "url": "/static/libs/mapbox/images/g_1_w_8.png"}, + {"name": "material5", "url": "/static/libs/mapbox/images/1.jpg"}, {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"}, {"name": "泵车在线", "url": "/static/libs/mapbox/images/泵车在线.png", "width": 15,"height": 20}, {"name": "泵车离线", "url": "/static/libs/mapbox/images/泵车离线.png", "width": 15,"height": 20}, @@ -939,8 +939,8 @@ "match", ["get", "level"], "1",0.5, - "2",0.35, - "3",0.25, + "2",0.1, + "3",0.05, "4",0.05, 0.5 ] @@ -1228,6 +1228,7 @@ { "id": "pipeline_info", "key": "hb_wh_dhgx_pipe_line_n_y_w", + "source-layer": "hb_wh_dhgx_pipe_line_n_y_w", "type": "line", "filter": [ "all", @@ -1245,14 +1246,15 @@ "line-width": 2 }, "layout": {}, - "minzoom": 0, + "minzoom": 10, "maxzoom": 24, - "mType": "geojsonMvt", + "mType": "mvt", "columns": "segment_code AS 管段编码, pipeline_texture AS 管线材质, pipeline_diameter AS 管径, section_type AS 管段类型, flow_direction AS 流向, drainage_system AS 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { "id": "pipeline_point", "key": "hb_wh_dhgx_pipe_point_n_y_w", + "source-layer": "hb_wh_dhgx_pipe_point_n_y_w", "type": "symbol", "filter": [ "all", @@ -1290,18 +1292,19 @@ }, "minzoom": 14, "maxzoom": 24, - "mType": "geojsonMvt", + "mType": "mvt", "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { "id": "pipeline_info_text", "key": "hb_wh_dhgx_pipe_line_n_y_w", + "source-layer": "hb_wh_dhgx_pipe_line_n_y_w", "type": "symbol", "filter": [ "all", ["in", ["get", "管段类型"],["literal", [""]]] ], - "minzoom": 1, + "minzoom": 14, "layout": { "symbol-placement": "line-center", "symbol-spacing": 40, @@ -1341,7 +1344,7 @@ "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 2 }, - "mType": "geojsonMvt", + "mType": "mvt", "columns": "segment_code AS 管段编码, pipeline_texture AS 管线材质, pipeline_diameter AS 管径, section_type AS 管段类型, flow_direction AS 流向, drainage_system AS 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { @@ -1378,7 +1381,7 @@ "visibility": "none" }, "paint": { - "fill-extrusion-color": "rgba(13,55,142,1)", + "fill-extrusion-color": "rgba(213,213,213,1)", "fill-extrusion-height": [ "+", [ diff --git a/public/static/libs/mapbox/images/1.jpg b/public/static/libs/mapbox/images/1.jpg new file mode 100644 index 0000000..fcf018d --- /dev/null +++ b/public/static/libs/mapbox/images/1.jpg Binary files differ diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ea5cc9d..f06424f 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,14 +1,14 @@ { "params": { "basemap": "https://supermap2.wh-nf.cn:8090/bm", - "mvt": "https://supermap0.wh-nf.cn:8090/vt/mvt", + "mvt": "https://supermap0.wh-nf.cn:8090/vt/v1/mvt", "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], "init": { - "center": [114.46005135362464, 30.43882434475003], - "zoom": 10.8, + "center": [114.40776390595016, 30.484477581887262], + "zoom": 11.3, "maxZoom": 20.9, "minZoom": 1, "pitch": 0, @@ -52,7 +52,7 @@ {"name": "full_out", "url": "/static/libs/mapbox/images/full_out.png"}, {"name": "full_out_risk", "url": "/static/libs/mapbox/images/full_out_risk.png"}, {"name": "排渍调度", "url": "/static/libs/mapbox/images/排渍调度.png"}, - {"name": "material5", "url": "/static/libs/mapbox/images/g_1_w_8.png"}, + {"name": "material5", "url": "/static/libs/mapbox/images/1.jpg"}, {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"}, {"name": "泵车在线", "url": "/static/libs/mapbox/images/泵车在线.png", "width": 15,"height": 20}, {"name": "泵车离线", "url": "/static/libs/mapbox/images/泵车离线.png", "width": 15,"height": 20}, @@ -939,8 +939,8 @@ "match", ["get", "level"], "1",0.5, - "2",0.35, - "3",0.25, + "2",0.1, + "3",0.05, "4",0.05, 0.5 ] @@ -1228,6 +1228,7 @@ { "id": "pipeline_info", "key": "hb_wh_dhgx_pipe_line_n_y_w", + "source-layer": "hb_wh_dhgx_pipe_line_n_y_w", "type": "line", "filter": [ "all", @@ -1245,14 +1246,15 @@ "line-width": 2 }, "layout": {}, - "minzoom": 0, + "minzoom": 10, "maxzoom": 24, - "mType": "geojsonMvt", + "mType": "mvt", "columns": "segment_code AS 管段编码, pipeline_texture AS 管线材质, pipeline_diameter AS 管径, section_type AS 管段类型, flow_direction AS 流向, drainage_system AS 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { "id": "pipeline_point", "key": "hb_wh_dhgx_pipe_point_n_y_w", + "source-layer": "hb_wh_dhgx_pipe_point_n_y_w", "type": "symbol", "filter": [ "all", @@ -1290,18 +1292,19 @@ }, "minzoom": 14, "maxzoom": 24, - "mType": "geojsonMvt", + "mType": "mvt", "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { "id": "pipeline_info_text", "key": "hb_wh_dhgx_pipe_line_n_y_w", + "source-layer": "hb_wh_dhgx_pipe_line_n_y_w", "type": "symbol", "filter": [ "all", ["in", ["get", "管段类型"],["literal", [""]]] ], - "minzoom": 1, + "minzoom": 14, "layout": { "symbol-placement": "line-center", "symbol-spacing": 40, @@ -1341,7 +1344,7 @@ "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 2 }, - "mType": "geojsonMvt", + "mType": "mvt", "columns": "segment_code AS 管段编码, pipeline_texture AS 管线材质, pipeline_diameter AS 管径, section_type AS 管段类型, flow_direction AS 流向, drainage_system AS 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { @@ -1378,7 +1381,7 @@ "visibility": "none" }, "paint": { - "fill-extrusion-color": "rgba(13,55,142,1)", + "fill-extrusion-color": "rgba(213,213,213,1)", "fill-extrusion-height": [ "+", [ diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 2eca001..c04c677 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -108,8 +108,8 @@ ? setGifImage(item) : newfiberMap.map.loadImage( item.url.includes("http") - ? baseUrl + item.url - : window.location.origin.split("#")[0] + item.url, + ? item.url + : baseUrl + item.url, (error, image) => newfiberMap.map.addImage(item.name, image) ) ); diff --git a/public/static/libs/mapbox/images/1.jpg b/public/static/libs/mapbox/images/1.jpg new file mode 100644 index 0000000..fcf018d --- /dev/null +++ b/public/static/libs/mapbox/images/1.jpg Binary files differ diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ea5cc9d..f06424f 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,14 +1,14 @@ { "params": { "basemap": "https://supermap2.wh-nf.cn:8090/bm", - "mvt": "https://supermap0.wh-nf.cn:8090/vt/mvt", + "mvt": "https://supermap0.wh-nf.cn:8090/vt/v1/mvt", "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], "init": { - "center": [114.46005135362464, 30.43882434475003], - "zoom": 10.8, + "center": [114.40776390595016, 30.484477581887262], + "zoom": 11.3, "maxZoom": 20.9, "minZoom": 1, "pitch": 0, @@ -52,7 +52,7 @@ {"name": "full_out", "url": "/static/libs/mapbox/images/full_out.png"}, {"name": "full_out_risk", "url": "/static/libs/mapbox/images/full_out_risk.png"}, {"name": "排渍调度", "url": "/static/libs/mapbox/images/排渍调度.png"}, - {"name": "material5", "url": "/static/libs/mapbox/images/g_1_w_8.png"}, + {"name": "material5", "url": "/static/libs/mapbox/images/1.jpg"}, {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"}, {"name": "泵车在线", "url": "/static/libs/mapbox/images/泵车在线.png", "width": 15,"height": 20}, {"name": "泵车离线", "url": "/static/libs/mapbox/images/泵车离线.png", "width": 15,"height": 20}, @@ -939,8 +939,8 @@ "match", ["get", "level"], "1",0.5, - "2",0.35, - "3",0.25, + "2",0.1, + "3",0.05, "4",0.05, 0.5 ] @@ -1228,6 +1228,7 @@ { "id": "pipeline_info", "key": "hb_wh_dhgx_pipe_line_n_y_w", + "source-layer": "hb_wh_dhgx_pipe_line_n_y_w", "type": "line", "filter": [ "all", @@ -1245,14 +1246,15 @@ "line-width": 2 }, "layout": {}, - "minzoom": 0, + "minzoom": 10, "maxzoom": 24, - "mType": "geojsonMvt", + "mType": "mvt", "columns": "segment_code AS 管段编码, pipeline_texture AS 管线材质, pipeline_diameter AS 管径, section_type AS 管段类型, flow_direction AS 流向, drainage_system AS 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { "id": "pipeline_point", "key": "hb_wh_dhgx_pipe_point_n_y_w", + "source-layer": "hb_wh_dhgx_pipe_point_n_y_w", "type": "symbol", "filter": [ "all", @@ -1290,18 +1292,19 @@ }, "minzoom": 14, "maxzoom": 24, - "mType": "geojsonMvt", + "mType": "mvt", "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { "id": "pipeline_info_text", "key": "hb_wh_dhgx_pipe_line_n_y_w", + "source-layer": "hb_wh_dhgx_pipe_line_n_y_w", "type": "symbol", "filter": [ "all", ["in", ["get", "管段类型"],["literal", [""]]] ], - "minzoom": 1, + "minzoom": 14, "layout": { "symbol-placement": "line-center", "symbol-spacing": 40, @@ -1341,7 +1344,7 @@ "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 2 }, - "mType": "geojsonMvt", + "mType": "mvt", "columns": "segment_code AS 管段编码, pipeline_texture AS 管线材质, pipeline_diameter AS 管径, section_type AS 管段类型, flow_direction AS 流向, drainage_system AS 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { @@ -1378,7 +1381,7 @@ "visibility": "none" }, "paint": { - "fill-extrusion-color": "rgba(13,55,142,1)", + "fill-extrusion-color": "rgba(213,213,213,1)", "fill-extrusion-height": [ "+", [ diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 2eca001..c04c677 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -108,8 +108,8 @@ ? setGifImage(item) : newfiberMap.map.loadImage( item.url.includes("http") - ? baseUrl + item.url - : window.location.origin.split("#")[0] + item.url, + ? item.url + : baseUrl + item.url, (error, image) => newfiberMap.map.addImage(item.name, image) ) ); diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 797858b..8d70150 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -312,6 +312,7 @@ } ::v-deep .LayerControlBox { + overflow:auto; z-index: 0; position: absolute; left: 500px; diff --git a/public/static/libs/mapbox/images/1.jpg b/public/static/libs/mapbox/images/1.jpg new file mode 100644 index 0000000..fcf018d --- /dev/null +++ b/public/static/libs/mapbox/images/1.jpg Binary files differ diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ea5cc9d..f06424f 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,14 +1,14 @@ { "params": { "basemap": "https://supermap2.wh-nf.cn:8090/bm", - "mvt": "https://supermap0.wh-nf.cn:8090/vt/mvt", + "mvt": "https://supermap0.wh-nf.cn:8090/vt/v1/mvt", "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], "init": { - "center": [114.46005135362464, 30.43882434475003], - "zoom": 10.8, + "center": [114.40776390595016, 30.484477581887262], + "zoom": 11.3, "maxZoom": 20.9, "minZoom": 1, "pitch": 0, @@ -52,7 +52,7 @@ {"name": "full_out", "url": "/static/libs/mapbox/images/full_out.png"}, {"name": "full_out_risk", "url": "/static/libs/mapbox/images/full_out_risk.png"}, {"name": "排渍调度", "url": "/static/libs/mapbox/images/排渍调度.png"}, - {"name": "material5", "url": "/static/libs/mapbox/images/g_1_w_8.png"}, + {"name": "material5", "url": "/static/libs/mapbox/images/1.jpg"}, {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"}, {"name": "泵车在线", "url": "/static/libs/mapbox/images/泵车在线.png", "width": 15,"height": 20}, {"name": "泵车离线", "url": "/static/libs/mapbox/images/泵车离线.png", "width": 15,"height": 20}, @@ -939,8 +939,8 @@ "match", ["get", "level"], "1",0.5, - "2",0.35, - "3",0.25, + "2",0.1, + "3",0.05, "4",0.05, 0.5 ] @@ -1228,6 +1228,7 @@ { "id": "pipeline_info", "key": "hb_wh_dhgx_pipe_line_n_y_w", + "source-layer": "hb_wh_dhgx_pipe_line_n_y_w", "type": "line", "filter": [ "all", @@ -1245,14 +1246,15 @@ "line-width": 2 }, "layout": {}, - "minzoom": 0, + "minzoom": 10, "maxzoom": 24, - "mType": "geojsonMvt", + "mType": "mvt", "columns": "segment_code AS 管段编码, pipeline_texture AS 管线材质, pipeline_diameter AS 管径, section_type AS 管段类型, flow_direction AS 流向, drainage_system AS 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { "id": "pipeline_point", "key": "hb_wh_dhgx_pipe_point_n_y_w", + "source-layer": "hb_wh_dhgx_pipe_point_n_y_w", "type": "symbol", "filter": [ "all", @@ -1290,18 +1292,19 @@ }, "minzoom": 14, "maxzoom": 24, - "mType": "geojsonMvt", + "mType": "mvt", "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { "id": "pipeline_info_text", "key": "hb_wh_dhgx_pipe_line_n_y_w", + "source-layer": "hb_wh_dhgx_pipe_line_n_y_w", "type": "symbol", "filter": [ "all", ["in", ["get", "管段类型"],["literal", [""]]] ], - "minzoom": 1, + "minzoom": 14, "layout": { "symbol-placement": "line-center", "symbol-spacing": 40, @@ -1341,7 +1344,7 @@ "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 2 }, - "mType": "geojsonMvt", + "mType": "mvt", "columns": "segment_code AS 管段编码, pipeline_texture AS 管线材质, pipeline_diameter AS 管径, section_type AS 管段类型, flow_direction AS 流向, drainage_system AS 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry" }, { @@ -1378,7 +1381,7 @@ "visibility": "none" }, "paint": { - "fill-extrusion-color": "rgba(13,55,142,1)", + "fill-extrusion-color": "rgba(213,213,213,1)", "fill-extrusion-height": [ "+", [ diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 2eca001..c04c677 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -108,8 +108,8 @@ ? setGifImage(item) : newfiberMap.map.loadImage( item.url.includes("http") - ? baseUrl + item.url - : window.location.origin.split("#")[0] + item.url, + ? item.url + : baseUrl + item.url, (error, image) => newfiberMap.map.addImage(item.name, image) ) ); diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 797858b..8d70150 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -312,6 +312,7 @@ } ::v-deep .LayerControlBox { + overflow:auto; z-index: 0; position: absolute; left: 500px; diff --git a/src/views/pictureOnMap/page/DrainageSystem/index.vue b/src/views/pictureOnMap/page/DrainageSystem/index.vue index 0bd18bd..e347b50 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/index.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/index.vue @@ -100,7 +100,7 @@ onMounted(() => { let initeGLTimer = setInterval(() => { - if (!newfiberMap) return; + if (!window.newfiberMap) return; TypeClick(AllData.yw_type[1]); clearInterval(initeGLTimer);