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..0906704 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -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}, @@ -1378,7 +1378,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..0906704 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -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}, @@ -1378,7 +1378,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..0906704 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -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}, @@ -1378,7 +1378,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;