diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index bdf6856..770f52a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,30 +18,30 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap8.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap9.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap10.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap11.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap12.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap13.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap14.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap15.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://dhgx0.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx1.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx3.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx2.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx4.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx5.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx6.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx8.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx9.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx10.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx11.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx12.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx13.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx14.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx15.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 } }, - "sprite": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/sprite", - "glyphs": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/fonts/{fontstack}/{range}.pbf", + "sprite": "https://dhgx12.wh-nf.cn:7081/bm/static/map/style/sprite", + "glyphs": "https://dhgx10.wh-nf.cn:7081/bm/static/map/style/fonts/{fontstack}/{range}.pbf", "layers": [ { "id": "background", diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index bdf6856..770f52a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,30 +18,30 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap8.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap9.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap10.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap11.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap12.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap13.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap14.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap15.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://dhgx0.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx1.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx3.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx2.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx4.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx5.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx6.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx8.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx9.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx10.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx11.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx12.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx13.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx14.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx15.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 } }, - "sprite": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/sprite", - "glyphs": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/fonts/{fontstack}/{range}.pbf", + "sprite": "https://dhgx12.wh-nf.cn:7081/bm/static/map/style/sprite", + "glyphs": "https://dhgx10.wh-nf.cn:7081/bm/static/map/style/fonts/{fontstack}/{range}.pbf", "layers": [ { "id": "background", diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ed18e3d..45e161c 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,25 +1,25 @@ { "params": { - "basemap": "https://supermap2.wh-nf.cn:8090/bm", + "basemap": "https://dhgx19.wh-nf.cn:7081/bm", "mvt": [ - "https://supermap0.wh-nf.cn:8090/vt/mvt", - "https://supermap1.wh-nf.cn:8090/vt/mvt", - "https://supermap2.wh-nf.cn:8090/vt/mvt", - "https://supermap3.wh-nf.cn:8090/vt/mvt", - "https://supermap4.wh-nf.cn:8090/vt/mvt", - "https://supermap5.wh-nf.cn:8090/vt/mvt", - "https://supermap6.wh-nf.cn:8090/vt/mvt", - "https://supermap7.wh-nf.cn:8090/vt/mvt", - "https://supermap8.wh-nf.cn:8090/vt/mvt", - "https://supermap9.wh-nf.cn:8090/vt/mvt", - "https://supermap10.wh-nf.cn:8090/vt/mvt", - "https://supermap11.wh-nf.cn:8090/vt/mvt", - "https://supermap12.wh-nf.cn:8090/vt/mvt", - "https://supermap13.wh-nf.cn:8090/vt/mvt", - "https://supermap14.wh-nf.cn:8090/vt/mvt", - "https://supermap15.wh-nf.cn:8090/vt/mvt" + "https://dhgx0.wh-nf.cn:7081/vt/mvt", + "https://dhgx1.wh-nf.cn:7081/vt/mvt", + "https://dhgx2.wh-nf.cn:7081/vt/mvt", + "https://dhgx3.wh-nf.cn:7081/vt/mvt", + "https://dhgx4.wh-nf.cn:7081/vt/mvt", + "https://dhgx5.wh-nf.cn:7081/vt/mvt", + "https://dhgx6.wh-nf.cn:7081/vt/mvt", + "https://dhgx7.wh-nf.cn:7081/vt/mvt", + "https://dhgx8.wh-nf.cn:7081/vt/mvt", + "https://dhgx9.wh-nf.cn:7081/vt/mvt", + "https://dhgx10.wh-nf.cn:7081/vt/mvt", + "https://dhgx11.wh-nf.cn:7081/vt/mvt", + "https://dhgx12.wh-nf.cn:7081/vt/mvt", + "https://dhgx13.wh-nf.cn:7081/vt/mvt", + "https://dhgx14.wh-nf.cn:7081/vt/mvt", + "https://dhgx15.wh-nf.cn:7081/vt/mvt" ], - "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", + "geojson": "https://dhgx9.wh-nf.cn:7081/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index bdf6856..770f52a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,30 +18,30 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap8.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap9.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap10.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap11.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap12.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap13.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap14.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap15.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://dhgx0.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx1.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx3.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx2.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx4.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx5.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx6.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx8.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx9.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx10.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx11.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx12.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx13.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx14.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx15.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 } }, - "sprite": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/sprite", - "glyphs": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/fonts/{fontstack}/{range}.pbf", + "sprite": "https://dhgx12.wh-nf.cn:7081/bm/static/map/style/sprite", + "glyphs": "https://dhgx10.wh-nf.cn:7081/bm/static/map/style/fonts/{fontstack}/{range}.pbf", "layers": [ { "id": "background", diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ed18e3d..45e161c 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,25 +1,25 @@ { "params": { - "basemap": "https://supermap2.wh-nf.cn:8090/bm", + "basemap": "https://dhgx19.wh-nf.cn:7081/bm", "mvt": [ - "https://supermap0.wh-nf.cn:8090/vt/mvt", - "https://supermap1.wh-nf.cn:8090/vt/mvt", - "https://supermap2.wh-nf.cn:8090/vt/mvt", - "https://supermap3.wh-nf.cn:8090/vt/mvt", - "https://supermap4.wh-nf.cn:8090/vt/mvt", - "https://supermap5.wh-nf.cn:8090/vt/mvt", - "https://supermap6.wh-nf.cn:8090/vt/mvt", - "https://supermap7.wh-nf.cn:8090/vt/mvt", - "https://supermap8.wh-nf.cn:8090/vt/mvt", - "https://supermap9.wh-nf.cn:8090/vt/mvt", - "https://supermap10.wh-nf.cn:8090/vt/mvt", - "https://supermap11.wh-nf.cn:8090/vt/mvt", - "https://supermap12.wh-nf.cn:8090/vt/mvt", - "https://supermap13.wh-nf.cn:8090/vt/mvt", - "https://supermap14.wh-nf.cn:8090/vt/mvt", - "https://supermap15.wh-nf.cn:8090/vt/mvt" + "https://dhgx0.wh-nf.cn:7081/vt/mvt", + "https://dhgx1.wh-nf.cn:7081/vt/mvt", + "https://dhgx2.wh-nf.cn:7081/vt/mvt", + "https://dhgx3.wh-nf.cn:7081/vt/mvt", + "https://dhgx4.wh-nf.cn:7081/vt/mvt", + "https://dhgx5.wh-nf.cn:7081/vt/mvt", + "https://dhgx6.wh-nf.cn:7081/vt/mvt", + "https://dhgx7.wh-nf.cn:7081/vt/mvt", + "https://dhgx8.wh-nf.cn:7081/vt/mvt", + "https://dhgx9.wh-nf.cn:7081/vt/mvt", + "https://dhgx10.wh-nf.cn:7081/vt/mvt", + "https://dhgx11.wh-nf.cn:7081/vt/mvt", + "https://dhgx12.wh-nf.cn:7081/vt/mvt", + "https://dhgx13.wh-nf.cn:7081/vt/mvt", + "https://dhgx14.wh-nf.cn:7081/vt/mvt", + "https://dhgx15.wh-nf.cn:7081/vt/mvt" ], - "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", + "geojson": "https://dhgx9.wh-nf.cn:7081/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 2a6d65b..f94a395 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -534,9 +534,12 @@ }; const refreshGeoJSON = () => { - Object.keys(geojson).forEach( - (key) => map.getSource(key) && map.getSource(key).setData(geojson[key]) - ); + const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches); + Object.keys(geojson).forEach((key) => { + map.getSource(key) && map.getSource(key).setData(geojson[key]); + cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles()); + console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key))); + }); map.triggerRepaint(); }; diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index bdf6856..770f52a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,30 +18,30 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap8.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap9.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap10.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap11.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap12.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap13.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap14.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap15.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://dhgx0.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx1.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx3.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx2.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx4.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx5.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx6.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx8.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx9.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx10.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx11.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx12.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx13.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx14.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx15.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 } }, - "sprite": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/sprite", - "glyphs": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/fonts/{fontstack}/{range}.pbf", + "sprite": "https://dhgx12.wh-nf.cn:7081/bm/static/map/style/sprite", + "glyphs": "https://dhgx10.wh-nf.cn:7081/bm/static/map/style/fonts/{fontstack}/{range}.pbf", "layers": [ { "id": "background", diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ed18e3d..45e161c 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,25 +1,25 @@ { "params": { - "basemap": "https://supermap2.wh-nf.cn:8090/bm", + "basemap": "https://dhgx19.wh-nf.cn:7081/bm", "mvt": [ - "https://supermap0.wh-nf.cn:8090/vt/mvt", - "https://supermap1.wh-nf.cn:8090/vt/mvt", - "https://supermap2.wh-nf.cn:8090/vt/mvt", - "https://supermap3.wh-nf.cn:8090/vt/mvt", - "https://supermap4.wh-nf.cn:8090/vt/mvt", - "https://supermap5.wh-nf.cn:8090/vt/mvt", - "https://supermap6.wh-nf.cn:8090/vt/mvt", - "https://supermap7.wh-nf.cn:8090/vt/mvt", - "https://supermap8.wh-nf.cn:8090/vt/mvt", - "https://supermap9.wh-nf.cn:8090/vt/mvt", - "https://supermap10.wh-nf.cn:8090/vt/mvt", - "https://supermap11.wh-nf.cn:8090/vt/mvt", - "https://supermap12.wh-nf.cn:8090/vt/mvt", - "https://supermap13.wh-nf.cn:8090/vt/mvt", - "https://supermap14.wh-nf.cn:8090/vt/mvt", - "https://supermap15.wh-nf.cn:8090/vt/mvt" + "https://dhgx0.wh-nf.cn:7081/vt/mvt", + "https://dhgx1.wh-nf.cn:7081/vt/mvt", + "https://dhgx2.wh-nf.cn:7081/vt/mvt", + "https://dhgx3.wh-nf.cn:7081/vt/mvt", + "https://dhgx4.wh-nf.cn:7081/vt/mvt", + "https://dhgx5.wh-nf.cn:7081/vt/mvt", + "https://dhgx6.wh-nf.cn:7081/vt/mvt", + "https://dhgx7.wh-nf.cn:7081/vt/mvt", + "https://dhgx8.wh-nf.cn:7081/vt/mvt", + "https://dhgx9.wh-nf.cn:7081/vt/mvt", + "https://dhgx10.wh-nf.cn:7081/vt/mvt", + "https://dhgx11.wh-nf.cn:7081/vt/mvt", + "https://dhgx12.wh-nf.cn:7081/vt/mvt", + "https://dhgx13.wh-nf.cn:7081/vt/mvt", + "https://dhgx14.wh-nf.cn:7081/vt/mvt", + "https://dhgx15.wh-nf.cn:7081/vt/mvt" ], - "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", + "geojson": "https://dhgx9.wh-nf.cn:7081/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 2a6d65b..f94a395 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -534,9 +534,12 @@ }; const refreshGeoJSON = () => { - Object.keys(geojson).forEach( - (key) => map.getSource(key) && map.getSource(key).setData(geojson[key]) - ); + const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches); + Object.keys(geojson).forEach((key) => { + map.getSource(key) && map.getSource(key).setData(geojson[key]); + cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles()); + console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key))); + }); map.triggerRepaint(); }; diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 5b05425..1df1977 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -351,19 +351,19 @@ ({ 1: () => { !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init); - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 2: () => { - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 3: () => { [ () => { - wsRouteToMapByName(properties); + wsRouteToMapByName([properties]); }, () => { const _keys_ = [ @@ -427,85 +427,7 @@ psfq.prevIds.push(properties); } - function wsRouteToMapByName(properties) { - const _keys_ = [ - "污水系统流向1", - "污水系统流向", - "1_泵站", - "1_污水处理厂", - "sewage_pipeline_quality1", - "sewage_pump_station_info1", - "storage_tank_info1", - ]; - _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); - busEmit(removeMapDatas.key, _keys_); - let features = _.cloneDeep( - ws_routeGeoJSON.features.filter((i) => - i.properties.bind.split(",").includes(properties.name) - ) - ); - let geojson = turf.featureCollection( - features.map((i) => - Object.assign(i, { - properties: { - ...i.properties, - name: i.properties.name, - type: i.properties._type || "污水系统流向1", - color: "rgb(255,74,25)", - width: [0, 7, 5, 3][properties.level], - }, - }) - ) - ); - newfiberMap - .getLayers() - .filter((i) => i.newfiberId == _keys_[1])[0] - .setData(geojson); - busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); - let [features_point, features_point1, features_point2] = [[], [], []]; - let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0]; - if (["2", "3"].includes(properties.level)) { - let kk = _.replace(_keys_[4], /\d+/g, ""); - features_point = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => i.properties.type.includes(kk)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - features_point1 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[5].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - } - features_point2 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[6].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - let geojson1 = turf.featureCollection( - [ - ...features_point.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[4] }, - })), - ...features_point1.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[5] }, - })), - ...features_point2.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[6] }, - })), - ] - .flat() - .filter(Boolean) - ); - busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); - } function showOutletInfo(properties) { const key = "outlet_info"; @@ -647,6 +569,36 @@ } }; +function wsRouteToMapByName(properties) { + const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params; + const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"]; + _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); + busEmit(removeMapDatas.key, _keys_); + if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties); + let geojson = turf.featureCollection([]); + properties.forEach(p => { + let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name))); + geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},}))); + busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); + }) + newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson); + if(properties.length != 1) return; + let [features_point, features_point1, features_point2] = [[], [], []]; + let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0]; + if (["2", "3"].includes(properties[0].level)) { + let kk = _.replace(_keys_[4], /\d+/g, ""); + features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + } + features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + let geojson1 = turf.featureCollection([ + ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})), + ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})), + ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },})) + ].flat().filter(Boolean) + ); + busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); +} function clearRouteMethod() { const { removeMapDatas } = events_params; const _keys = [ @@ -1172,6 +1124,7 @@ trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap }, clearTrajectory: { key: "clearTrajectory", method: clearTrajectory }, clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData }, + wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName }, load3DTiles: { key: "load3DTiles", method: load3DTiles }, remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles }, isOpenPanorama: { diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index bdf6856..770f52a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,30 +18,30 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap8.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap9.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap10.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap11.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap12.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap13.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap14.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap15.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://dhgx0.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx1.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx3.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx2.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx4.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx5.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx6.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx8.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx9.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx10.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx11.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx12.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx13.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx14.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx15.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 } }, - "sprite": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/sprite", - "glyphs": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/fonts/{fontstack}/{range}.pbf", + "sprite": "https://dhgx12.wh-nf.cn:7081/bm/static/map/style/sprite", + "glyphs": "https://dhgx10.wh-nf.cn:7081/bm/static/map/style/fonts/{fontstack}/{range}.pbf", "layers": [ { "id": "background", diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ed18e3d..45e161c 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,25 +1,25 @@ { "params": { - "basemap": "https://supermap2.wh-nf.cn:8090/bm", + "basemap": "https://dhgx19.wh-nf.cn:7081/bm", "mvt": [ - "https://supermap0.wh-nf.cn:8090/vt/mvt", - "https://supermap1.wh-nf.cn:8090/vt/mvt", - "https://supermap2.wh-nf.cn:8090/vt/mvt", - "https://supermap3.wh-nf.cn:8090/vt/mvt", - "https://supermap4.wh-nf.cn:8090/vt/mvt", - "https://supermap5.wh-nf.cn:8090/vt/mvt", - "https://supermap6.wh-nf.cn:8090/vt/mvt", - "https://supermap7.wh-nf.cn:8090/vt/mvt", - "https://supermap8.wh-nf.cn:8090/vt/mvt", - "https://supermap9.wh-nf.cn:8090/vt/mvt", - "https://supermap10.wh-nf.cn:8090/vt/mvt", - "https://supermap11.wh-nf.cn:8090/vt/mvt", - "https://supermap12.wh-nf.cn:8090/vt/mvt", - "https://supermap13.wh-nf.cn:8090/vt/mvt", - "https://supermap14.wh-nf.cn:8090/vt/mvt", - "https://supermap15.wh-nf.cn:8090/vt/mvt" + "https://dhgx0.wh-nf.cn:7081/vt/mvt", + "https://dhgx1.wh-nf.cn:7081/vt/mvt", + "https://dhgx2.wh-nf.cn:7081/vt/mvt", + "https://dhgx3.wh-nf.cn:7081/vt/mvt", + "https://dhgx4.wh-nf.cn:7081/vt/mvt", + "https://dhgx5.wh-nf.cn:7081/vt/mvt", + "https://dhgx6.wh-nf.cn:7081/vt/mvt", + "https://dhgx7.wh-nf.cn:7081/vt/mvt", + "https://dhgx8.wh-nf.cn:7081/vt/mvt", + "https://dhgx9.wh-nf.cn:7081/vt/mvt", + "https://dhgx10.wh-nf.cn:7081/vt/mvt", + "https://dhgx11.wh-nf.cn:7081/vt/mvt", + "https://dhgx12.wh-nf.cn:7081/vt/mvt", + "https://dhgx13.wh-nf.cn:7081/vt/mvt", + "https://dhgx14.wh-nf.cn:7081/vt/mvt", + "https://dhgx15.wh-nf.cn:7081/vt/mvt" ], - "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", + "geojson": "https://dhgx9.wh-nf.cn:7081/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 2a6d65b..f94a395 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -534,9 +534,12 @@ }; const refreshGeoJSON = () => { - Object.keys(geojson).forEach( - (key) => map.getSource(key) && map.getSource(key).setData(geojson[key]) - ); + const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches); + Object.keys(geojson).forEach((key) => { + map.getSource(key) && map.getSource(key).setData(geojson[key]); + cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles()); + console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key))); + }); map.triggerRepaint(); }; diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 5b05425..1df1977 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -351,19 +351,19 @@ ({ 1: () => { !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init); - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 2: () => { - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 3: () => { [ () => { - wsRouteToMapByName(properties); + wsRouteToMapByName([properties]); }, () => { const _keys_ = [ @@ -427,85 +427,7 @@ psfq.prevIds.push(properties); } - function wsRouteToMapByName(properties) { - const _keys_ = [ - "污水系统流向1", - "污水系统流向", - "1_泵站", - "1_污水处理厂", - "sewage_pipeline_quality1", - "sewage_pump_station_info1", - "storage_tank_info1", - ]; - _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); - busEmit(removeMapDatas.key, _keys_); - let features = _.cloneDeep( - ws_routeGeoJSON.features.filter((i) => - i.properties.bind.split(",").includes(properties.name) - ) - ); - let geojson = turf.featureCollection( - features.map((i) => - Object.assign(i, { - properties: { - ...i.properties, - name: i.properties.name, - type: i.properties._type || "污水系统流向1", - color: "rgb(255,74,25)", - width: [0, 7, 5, 3][properties.level], - }, - }) - ) - ); - newfiberMap - .getLayers() - .filter((i) => i.newfiberId == _keys_[1])[0] - .setData(geojson); - busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); - let [features_point, features_point1, features_point2] = [[], [], []]; - let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0]; - if (["2", "3"].includes(properties.level)) { - let kk = _.replace(_keys_[4], /\d+/g, ""); - features_point = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => i.properties.type.includes(kk)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - features_point1 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[5].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - } - features_point2 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[6].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - let geojson1 = turf.featureCollection( - [ - ...features_point.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[4] }, - })), - ...features_point1.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[5] }, - })), - ...features_point2.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[6] }, - })), - ] - .flat() - .filter(Boolean) - ); - busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); - } function showOutletInfo(properties) { const key = "outlet_info"; @@ -647,6 +569,36 @@ } }; +function wsRouteToMapByName(properties) { + const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params; + const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"]; + _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); + busEmit(removeMapDatas.key, _keys_); + if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties); + let geojson = turf.featureCollection([]); + properties.forEach(p => { + let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name))); + geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},}))); + busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); + }) + newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson); + if(properties.length != 1) return; + let [features_point, features_point1, features_point2] = [[], [], []]; + let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0]; + if (["2", "3"].includes(properties[0].level)) { + let kk = _.replace(_keys_[4], /\d+/g, ""); + features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + } + features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + let geojson1 = turf.featureCollection([ + ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})), + ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})), + ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },})) + ].flat().filter(Boolean) + ); + busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); +} function clearRouteMethod() { const { removeMapDatas } = events_params; const _keys = [ @@ -1172,6 +1124,7 @@ trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap }, clearTrajectory: { key: "clearTrajectory", method: clearTrajectory }, clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData }, + wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName }, load3DTiles: { key: "load3DTiles", method: load3DTiles }, remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles }, isOpenPanorama: { diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 3dfbd82..7e225da 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -131,9 +131,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : ''; } else { return; } @@ -186,10 +184,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.dataID = Getproperties.value.stCode; - dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : ''; } else { return; } @@ -260,8 +255,9 @@ } // debugger; let params = { - dataCode: specificFun(type) || type, - scene: 'basis_monitor', + dataCode: type, + scene: specificFun(type) || 'basis_monitor', + // scene: "basis_monitor", dataId: dataId, }; drainageDispatchGetMenu(params).then(res => { @@ -372,6 +368,7 @@ console.log('经纬度', lngLat); console.log('数据', properties); console.log('layerid', layerId); + dialogConfig.title = properties.stName || properties.name; // 处理标注 Getproperties.value = properties; @@ -474,6 +471,7 @@ dialogConfig.visible = is; }; function anotherMeht(item) { + debugger; let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index bdf6856..770f52a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,30 +18,30 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap8.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap9.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap10.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap11.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap12.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap13.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap14.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap15.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://dhgx0.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx1.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx3.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx2.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx4.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx5.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx6.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx8.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx9.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx10.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx11.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx12.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx13.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx14.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx15.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 } }, - "sprite": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/sprite", - "glyphs": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/fonts/{fontstack}/{range}.pbf", + "sprite": "https://dhgx12.wh-nf.cn:7081/bm/static/map/style/sprite", + "glyphs": "https://dhgx10.wh-nf.cn:7081/bm/static/map/style/fonts/{fontstack}/{range}.pbf", "layers": [ { "id": "background", diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ed18e3d..45e161c 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,25 +1,25 @@ { "params": { - "basemap": "https://supermap2.wh-nf.cn:8090/bm", + "basemap": "https://dhgx19.wh-nf.cn:7081/bm", "mvt": [ - "https://supermap0.wh-nf.cn:8090/vt/mvt", - "https://supermap1.wh-nf.cn:8090/vt/mvt", - "https://supermap2.wh-nf.cn:8090/vt/mvt", - "https://supermap3.wh-nf.cn:8090/vt/mvt", - "https://supermap4.wh-nf.cn:8090/vt/mvt", - "https://supermap5.wh-nf.cn:8090/vt/mvt", - "https://supermap6.wh-nf.cn:8090/vt/mvt", - "https://supermap7.wh-nf.cn:8090/vt/mvt", - "https://supermap8.wh-nf.cn:8090/vt/mvt", - "https://supermap9.wh-nf.cn:8090/vt/mvt", - "https://supermap10.wh-nf.cn:8090/vt/mvt", - "https://supermap11.wh-nf.cn:8090/vt/mvt", - "https://supermap12.wh-nf.cn:8090/vt/mvt", - "https://supermap13.wh-nf.cn:8090/vt/mvt", - "https://supermap14.wh-nf.cn:8090/vt/mvt", - "https://supermap15.wh-nf.cn:8090/vt/mvt" + "https://dhgx0.wh-nf.cn:7081/vt/mvt", + "https://dhgx1.wh-nf.cn:7081/vt/mvt", + "https://dhgx2.wh-nf.cn:7081/vt/mvt", + "https://dhgx3.wh-nf.cn:7081/vt/mvt", + "https://dhgx4.wh-nf.cn:7081/vt/mvt", + "https://dhgx5.wh-nf.cn:7081/vt/mvt", + "https://dhgx6.wh-nf.cn:7081/vt/mvt", + "https://dhgx7.wh-nf.cn:7081/vt/mvt", + "https://dhgx8.wh-nf.cn:7081/vt/mvt", + "https://dhgx9.wh-nf.cn:7081/vt/mvt", + "https://dhgx10.wh-nf.cn:7081/vt/mvt", + "https://dhgx11.wh-nf.cn:7081/vt/mvt", + "https://dhgx12.wh-nf.cn:7081/vt/mvt", + "https://dhgx13.wh-nf.cn:7081/vt/mvt", + "https://dhgx14.wh-nf.cn:7081/vt/mvt", + "https://dhgx15.wh-nf.cn:7081/vt/mvt" ], - "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", + "geojson": "https://dhgx9.wh-nf.cn:7081/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 2a6d65b..f94a395 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -534,9 +534,12 @@ }; const refreshGeoJSON = () => { - Object.keys(geojson).forEach( - (key) => map.getSource(key) && map.getSource(key).setData(geojson[key]) - ); + const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches); + Object.keys(geojson).forEach((key) => { + map.getSource(key) && map.getSource(key).setData(geojson[key]); + cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles()); + console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key))); + }); map.triggerRepaint(); }; diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 5b05425..1df1977 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -351,19 +351,19 @@ ({ 1: () => { !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init); - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 2: () => { - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 3: () => { [ () => { - wsRouteToMapByName(properties); + wsRouteToMapByName([properties]); }, () => { const _keys_ = [ @@ -427,85 +427,7 @@ psfq.prevIds.push(properties); } - function wsRouteToMapByName(properties) { - const _keys_ = [ - "污水系统流向1", - "污水系统流向", - "1_泵站", - "1_污水处理厂", - "sewage_pipeline_quality1", - "sewage_pump_station_info1", - "storage_tank_info1", - ]; - _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); - busEmit(removeMapDatas.key, _keys_); - let features = _.cloneDeep( - ws_routeGeoJSON.features.filter((i) => - i.properties.bind.split(",").includes(properties.name) - ) - ); - let geojson = turf.featureCollection( - features.map((i) => - Object.assign(i, { - properties: { - ...i.properties, - name: i.properties.name, - type: i.properties._type || "污水系统流向1", - color: "rgb(255,74,25)", - width: [0, 7, 5, 3][properties.level], - }, - }) - ) - ); - newfiberMap - .getLayers() - .filter((i) => i.newfiberId == _keys_[1])[0] - .setData(geojson); - busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); - let [features_point, features_point1, features_point2] = [[], [], []]; - let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0]; - if (["2", "3"].includes(properties.level)) { - let kk = _.replace(_keys_[4], /\d+/g, ""); - features_point = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => i.properties.type.includes(kk)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - features_point1 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[5].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - } - features_point2 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[6].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - let geojson1 = turf.featureCollection( - [ - ...features_point.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[4] }, - })), - ...features_point1.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[5] }, - })), - ...features_point2.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[6] }, - })), - ] - .flat() - .filter(Boolean) - ); - busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); - } function showOutletInfo(properties) { const key = "outlet_info"; @@ -647,6 +569,36 @@ } }; +function wsRouteToMapByName(properties) { + const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params; + const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"]; + _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); + busEmit(removeMapDatas.key, _keys_); + if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties); + let geojson = turf.featureCollection([]); + properties.forEach(p => { + let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name))); + geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},}))); + busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); + }) + newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson); + if(properties.length != 1) return; + let [features_point, features_point1, features_point2] = [[], [], []]; + let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0]; + if (["2", "3"].includes(properties[0].level)) { + let kk = _.replace(_keys_[4], /\d+/g, ""); + features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + } + features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + let geojson1 = turf.featureCollection([ + ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})), + ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})), + ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },})) + ].flat().filter(Boolean) + ); + busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); +} function clearRouteMethod() { const { removeMapDatas } = events_params; const _keys = [ @@ -1172,6 +1124,7 @@ trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap }, clearTrajectory: { key: "clearTrajectory", method: clearTrajectory }, clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData }, + wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName }, load3DTiles: { key: "load3DTiles", method: load3DTiles }, remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles }, isOpenPanorama: { diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 3dfbd82..7e225da 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -131,9 +131,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : ''; } else { return; } @@ -186,10 +184,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.dataID = Getproperties.value.stCode; - dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : ''; } else { return; } @@ -260,8 +255,9 @@ } // debugger; let params = { - dataCode: specificFun(type) || type, - scene: 'basis_monitor', + dataCode: type, + scene: specificFun(type) || 'basis_monitor', + // scene: "basis_monitor", dataId: dataId, }; drainageDispatchGetMenu(params).then(res => { @@ -372,6 +368,7 @@ console.log('经纬度', lngLat); console.log('数据', properties); console.log('layerid', layerId); + dialogConfig.title = properties.stName || properties.name; // 处理标注 Getproperties.value = properties; @@ -474,6 +471,7 @@ dialogConfig.visible = is; }; function anotherMeht(item) { + debugger; let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 97f0cf3..9ecae08 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -14,22 +14,22 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '排水户统计' - : AllData.regionGrade == 'two' - ? '排水户统计' - : AllData.regionGrade == 'three' - ? '排水户统计' - : AllData.regionGrade == 'four' - ? '水量统计' - : '' + AllData.regionGrade == "one" + ? "排水户统计" + : AllData.regionGrade == "two" + ? "排水户统计" + : AllData.regionGrade == "three" + ? "排水户统计" + : AllData.regionGrade == "four" + ? "水量统计" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
@@ -50,15 +50,15 @@
{{ - AllData.regionGrade == 'one' - ? '管网统计' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '排水类别' - : AllData.regionGrade == 'four' - ? '排水类别' - : '' + AllData.regionGrade == "one" + ? "管网统计" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "排水类别" + : AllData.regionGrade == "four" + ? "排水类别" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -79,15 +79,15 @@
{{ - AllData.regionGrade == 'one' - ? '日污水水量' - : AllData.regionGrade == 'two' - ? '日污水水量' - : AllData.regionGrade == 'three' - ? '日水量统计' - : AllData.regionGrade == 'four' - ? '管网统计' - : '' + AllData.regionGrade == "one" + ? "日污水水量" + : AllData.regionGrade == "two" + ? "日污水水量" + : AllData.regionGrade == "three" + ? "日水量统计" + : AllData.regionGrade == "four" + ? "管网统计" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -110,11 +110,17 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -138,7 +147,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -153,62 +165,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -219,15 +237,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -235,71 +263,71 @@ @@ -1075,7 +1148,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1100,6 +1173,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1136,7 +1210,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index bdf6856..770f52a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,30 +18,30 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap8.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap9.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap10.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap11.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap12.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap13.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap14.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap15.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://dhgx0.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx1.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx3.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx2.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx4.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx5.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx6.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx8.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx9.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx10.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx11.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx12.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx13.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx14.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx15.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 } }, - "sprite": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/sprite", - "glyphs": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/fonts/{fontstack}/{range}.pbf", + "sprite": "https://dhgx12.wh-nf.cn:7081/bm/static/map/style/sprite", + "glyphs": "https://dhgx10.wh-nf.cn:7081/bm/static/map/style/fonts/{fontstack}/{range}.pbf", "layers": [ { "id": "background", diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ed18e3d..45e161c 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,25 +1,25 @@ { "params": { - "basemap": "https://supermap2.wh-nf.cn:8090/bm", + "basemap": "https://dhgx19.wh-nf.cn:7081/bm", "mvt": [ - "https://supermap0.wh-nf.cn:8090/vt/mvt", - "https://supermap1.wh-nf.cn:8090/vt/mvt", - "https://supermap2.wh-nf.cn:8090/vt/mvt", - "https://supermap3.wh-nf.cn:8090/vt/mvt", - "https://supermap4.wh-nf.cn:8090/vt/mvt", - "https://supermap5.wh-nf.cn:8090/vt/mvt", - "https://supermap6.wh-nf.cn:8090/vt/mvt", - "https://supermap7.wh-nf.cn:8090/vt/mvt", - "https://supermap8.wh-nf.cn:8090/vt/mvt", - "https://supermap9.wh-nf.cn:8090/vt/mvt", - "https://supermap10.wh-nf.cn:8090/vt/mvt", - "https://supermap11.wh-nf.cn:8090/vt/mvt", - "https://supermap12.wh-nf.cn:8090/vt/mvt", - "https://supermap13.wh-nf.cn:8090/vt/mvt", - "https://supermap14.wh-nf.cn:8090/vt/mvt", - "https://supermap15.wh-nf.cn:8090/vt/mvt" + "https://dhgx0.wh-nf.cn:7081/vt/mvt", + "https://dhgx1.wh-nf.cn:7081/vt/mvt", + "https://dhgx2.wh-nf.cn:7081/vt/mvt", + "https://dhgx3.wh-nf.cn:7081/vt/mvt", + "https://dhgx4.wh-nf.cn:7081/vt/mvt", + "https://dhgx5.wh-nf.cn:7081/vt/mvt", + "https://dhgx6.wh-nf.cn:7081/vt/mvt", + "https://dhgx7.wh-nf.cn:7081/vt/mvt", + "https://dhgx8.wh-nf.cn:7081/vt/mvt", + "https://dhgx9.wh-nf.cn:7081/vt/mvt", + "https://dhgx10.wh-nf.cn:7081/vt/mvt", + "https://dhgx11.wh-nf.cn:7081/vt/mvt", + "https://dhgx12.wh-nf.cn:7081/vt/mvt", + "https://dhgx13.wh-nf.cn:7081/vt/mvt", + "https://dhgx14.wh-nf.cn:7081/vt/mvt", + "https://dhgx15.wh-nf.cn:7081/vt/mvt" ], - "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", + "geojson": "https://dhgx9.wh-nf.cn:7081/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 2a6d65b..f94a395 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -534,9 +534,12 @@ }; const refreshGeoJSON = () => { - Object.keys(geojson).forEach( - (key) => map.getSource(key) && map.getSource(key).setData(geojson[key]) - ); + const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches); + Object.keys(geojson).forEach((key) => { + map.getSource(key) && map.getSource(key).setData(geojson[key]); + cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles()); + console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key))); + }); map.triggerRepaint(); }; diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 5b05425..1df1977 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -351,19 +351,19 @@ ({ 1: () => { !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init); - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 2: () => { - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 3: () => { [ () => { - wsRouteToMapByName(properties); + wsRouteToMapByName([properties]); }, () => { const _keys_ = [ @@ -427,85 +427,7 @@ psfq.prevIds.push(properties); } - function wsRouteToMapByName(properties) { - const _keys_ = [ - "污水系统流向1", - "污水系统流向", - "1_泵站", - "1_污水处理厂", - "sewage_pipeline_quality1", - "sewage_pump_station_info1", - "storage_tank_info1", - ]; - _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); - busEmit(removeMapDatas.key, _keys_); - let features = _.cloneDeep( - ws_routeGeoJSON.features.filter((i) => - i.properties.bind.split(",").includes(properties.name) - ) - ); - let geojson = turf.featureCollection( - features.map((i) => - Object.assign(i, { - properties: { - ...i.properties, - name: i.properties.name, - type: i.properties._type || "污水系统流向1", - color: "rgb(255,74,25)", - width: [0, 7, 5, 3][properties.level], - }, - }) - ) - ); - newfiberMap - .getLayers() - .filter((i) => i.newfiberId == _keys_[1])[0] - .setData(geojson); - busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); - let [features_point, features_point1, features_point2] = [[], [], []]; - let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0]; - if (["2", "3"].includes(properties.level)) { - let kk = _.replace(_keys_[4], /\d+/g, ""); - features_point = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => i.properties.type.includes(kk)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - features_point1 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[5].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - } - features_point2 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[6].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - let geojson1 = turf.featureCollection( - [ - ...features_point.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[4] }, - })), - ...features_point1.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[5] }, - })), - ...features_point2.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[6] }, - })), - ] - .flat() - .filter(Boolean) - ); - busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); - } function showOutletInfo(properties) { const key = "outlet_info"; @@ -647,6 +569,36 @@ } }; +function wsRouteToMapByName(properties) { + const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params; + const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"]; + _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); + busEmit(removeMapDatas.key, _keys_); + if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties); + let geojson = turf.featureCollection([]); + properties.forEach(p => { + let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name))); + geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},}))); + busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); + }) + newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson); + if(properties.length != 1) return; + let [features_point, features_point1, features_point2] = [[], [], []]; + let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0]; + if (["2", "3"].includes(properties[0].level)) { + let kk = _.replace(_keys_[4], /\d+/g, ""); + features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + } + features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + let geojson1 = turf.featureCollection([ + ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})), + ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})), + ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },})) + ].flat().filter(Boolean) + ); + busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); +} function clearRouteMethod() { const { removeMapDatas } = events_params; const _keys = [ @@ -1172,6 +1124,7 @@ trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap }, clearTrajectory: { key: "clearTrajectory", method: clearTrajectory }, clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData }, + wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName }, load3DTiles: { key: "load3DTiles", method: load3DTiles }, remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles }, isOpenPanorama: { diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 3dfbd82..7e225da 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -131,9 +131,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : ''; } else { return; } @@ -186,10 +184,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.dataID = Getproperties.value.stCode; - dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : ''; } else { return; } @@ -260,8 +255,9 @@ } // debugger; let params = { - dataCode: specificFun(type) || type, - scene: 'basis_monitor', + dataCode: type, + scene: specificFun(type) || 'basis_monitor', + // scene: "basis_monitor", dataId: dataId, }; drainageDispatchGetMenu(params).then(res => { @@ -372,6 +368,7 @@ console.log('经纬度', lngLat); console.log('数据', properties); console.log('layerid', layerId); + dialogConfig.title = properties.stName || properties.name; // 处理标注 Getproperties.value = properties; @@ -474,6 +471,7 @@ dialogConfig.visible = is; }; function anotherMeht(item) { + debugger; let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 97f0cf3..9ecae08 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -14,22 +14,22 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '排水户统计' - : AllData.regionGrade == 'two' - ? '排水户统计' - : AllData.regionGrade == 'three' - ? '排水户统计' - : AllData.regionGrade == 'four' - ? '水量统计' - : '' + AllData.regionGrade == "one" + ? "排水户统计" + : AllData.regionGrade == "two" + ? "排水户统计" + : AllData.regionGrade == "three" + ? "排水户统计" + : AllData.regionGrade == "four" + ? "水量统计" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
@@ -50,15 +50,15 @@
{{ - AllData.regionGrade == 'one' - ? '管网统计' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '排水类别' - : AllData.regionGrade == 'four' - ? '排水类别' - : '' + AllData.regionGrade == "one" + ? "管网统计" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "排水类别" + : AllData.regionGrade == "four" + ? "排水类别" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -79,15 +79,15 @@
{{ - AllData.regionGrade == 'one' - ? '日污水水量' - : AllData.regionGrade == 'two' - ? '日污水水量' - : AllData.regionGrade == 'three' - ? '日水量统计' - : AllData.regionGrade == 'four' - ? '管网统计' - : '' + AllData.regionGrade == "one" + ? "日污水水量" + : AllData.regionGrade == "two" + ? "日污水水量" + : AllData.regionGrade == "three" + ? "日水量统计" + : AllData.regionGrade == "four" + ? "管网统计" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -110,11 +110,17 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -138,7 +147,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -153,62 +165,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -219,15 +237,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -235,71 +263,71 @@ @@ -1075,7 +1148,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1100,6 +1173,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1136,7 +1210,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 62c4098..6ada224 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -14,28 +14,32 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '河湖水情' - : AllData.regionGrade == 'two' - ? '管网监测' - : AllData.regionGrade == 'three' - ? '管网统计' - : AllData.regionGrade == 'four' - ? '当日水量分析' - : '' + AllData.regionGrade == "one" + ? "河湖水情" + : AllData.regionGrade == "two" + ? "管网监测" + : AllData.regionGrade == "three" + ? "管网统计" + : AllData.regionGrade == "four" + ? "当日水量分析" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '流域管网' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '当日水量分析' - : AllData.regionGrade == 'four' - ? '渍水风险点' - : '' + AllData.regionGrade == "one" + ? "流域管网" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "当日水量分析" + : AllData.regionGrade == "four" + ? "渍水风险点" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '河湖排口' - : AllData.regionGrade == 'two' - ? '湖泊排口' - : AllData.regionGrade == 'three' - ? '渍水风险点' - : AllData.regionGrade == 'four' - ? '历史风险' - : '' + AllData.regionGrade == "one" + ? "河湖排口" + : AllData.regionGrade == "two" + ? "湖泊排口" + : AllData.regionGrade == "three" + ? "渍水风险点" + : AllData.regionGrade == "four" + ? "历史风险" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -142,7 +163,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -151,8 +175,13 @@
- - {{ AllData.SLFX.downstreamSiteWaterYield }} + + {{ + AllData.SLFX.downstreamSiteWaterYield + }} 万吨
@@ -166,62 +195,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -232,15 +267,25 @@
港渠统计 水质统计
- - + +
@@ -248,15 +293,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -264,75 +319,75 @@ @@ -1183,7 +1286,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1208,6 +1311,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1244,7 +1348,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; .SlList1P { diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index bdf6856..770f52a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,30 +18,30 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap8.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap9.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap10.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap11.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap12.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap13.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap14.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap15.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://dhgx0.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx1.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx3.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx2.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx4.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx5.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx6.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx8.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx9.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx10.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx11.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx12.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx13.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx14.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx15.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 } }, - "sprite": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/sprite", - "glyphs": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/fonts/{fontstack}/{range}.pbf", + "sprite": "https://dhgx12.wh-nf.cn:7081/bm/static/map/style/sprite", + "glyphs": "https://dhgx10.wh-nf.cn:7081/bm/static/map/style/fonts/{fontstack}/{range}.pbf", "layers": [ { "id": "background", diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ed18e3d..45e161c 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,25 +1,25 @@ { "params": { - "basemap": "https://supermap2.wh-nf.cn:8090/bm", + "basemap": "https://dhgx19.wh-nf.cn:7081/bm", "mvt": [ - "https://supermap0.wh-nf.cn:8090/vt/mvt", - "https://supermap1.wh-nf.cn:8090/vt/mvt", - "https://supermap2.wh-nf.cn:8090/vt/mvt", - "https://supermap3.wh-nf.cn:8090/vt/mvt", - "https://supermap4.wh-nf.cn:8090/vt/mvt", - "https://supermap5.wh-nf.cn:8090/vt/mvt", - "https://supermap6.wh-nf.cn:8090/vt/mvt", - "https://supermap7.wh-nf.cn:8090/vt/mvt", - "https://supermap8.wh-nf.cn:8090/vt/mvt", - "https://supermap9.wh-nf.cn:8090/vt/mvt", - "https://supermap10.wh-nf.cn:8090/vt/mvt", - "https://supermap11.wh-nf.cn:8090/vt/mvt", - "https://supermap12.wh-nf.cn:8090/vt/mvt", - "https://supermap13.wh-nf.cn:8090/vt/mvt", - "https://supermap14.wh-nf.cn:8090/vt/mvt", - "https://supermap15.wh-nf.cn:8090/vt/mvt" + "https://dhgx0.wh-nf.cn:7081/vt/mvt", + "https://dhgx1.wh-nf.cn:7081/vt/mvt", + "https://dhgx2.wh-nf.cn:7081/vt/mvt", + "https://dhgx3.wh-nf.cn:7081/vt/mvt", + "https://dhgx4.wh-nf.cn:7081/vt/mvt", + "https://dhgx5.wh-nf.cn:7081/vt/mvt", + "https://dhgx6.wh-nf.cn:7081/vt/mvt", + "https://dhgx7.wh-nf.cn:7081/vt/mvt", + "https://dhgx8.wh-nf.cn:7081/vt/mvt", + "https://dhgx9.wh-nf.cn:7081/vt/mvt", + "https://dhgx10.wh-nf.cn:7081/vt/mvt", + "https://dhgx11.wh-nf.cn:7081/vt/mvt", + "https://dhgx12.wh-nf.cn:7081/vt/mvt", + "https://dhgx13.wh-nf.cn:7081/vt/mvt", + "https://dhgx14.wh-nf.cn:7081/vt/mvt", + "https://dhgx15.wh-nf.cn:7081/vt/mvt" ], - "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", + "geojson": "https://dhgx9.wh-nf.cn:7081/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 2a6d65b..f94a395 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -534,9 +534,12 @@ }; const refreshGeoJSON = () => { - Object.keys(geojson).forEach( - (key) => map.getSource(key) && map.getSource(key).setData(geojson[key]) - ); + const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches); + Object.keys(geojson).forEach((key) => { + map.getSource(key) && map.getSource(key).setData(geojson[key]); + cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles()); + console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key))); + }); map.triggerRepaint(); }; diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 5b05425..1df1977 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -351,19 +351,19 @@ ({ 1: () => { !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init); - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 2: () => { - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 3: () => { [ () => { - wsRouteToMapByName(properties); + wsRouteToMapByName([properties]); }, () => { const _keys_ = [ @@ -427,85 +427,7 @@ psfq.prevIds.push(properties); } - function wsRouteToMapByName(properties) { - const _keys_ = [ - "污水系统流向1", - "污水系统流向", - "1_泵站", - "1_污水处理厂", - "sewage_pipeline_quality1", - "sewage_pump_station_info1", - "storage_tank_info1", - ]; - _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); - busEmit(removeMapDatas.key, _keys_); - let features = _.cloneDeep( - ws_routeGeoJSON.features.filter((i) => - i.properties.bind.split(",").includes(properties.name) - ) - ); - let geojson = turf.featureCollection( - features.map((i) => - Object.assign(i, { - properties: { - ...i.properties, - name: i.properties.name, - type: i.properties._type || "污水系统流向1", - color: "rgb(255,74,25)", - width: [0, 7, 5, 3][properties.level], - }, - }) - ) - ); - newfiberMap - .getLayers() - .filter((i) => i.newfiberId == _keys_[1])[0] - .setData(geojson); - busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); - let [features_point, features_point1, features_point2] = [[], [], []]; - let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0]; - if (["2", "3"].includes(properties.level)) { - let kk = _.replace(_keys_[4], /\d+/g, ""); - features_point = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => i.properties.type.includes(kk)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - features_point1 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[5].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - } - features_point2 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[6].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - let geojson1 = turf.featureCollection( - [ - ...features_point.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[4] }, - })), - ...features_point1.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[5] }, - })), - ...features_point2.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[6] }, - })), - ] - .flat() - .filter(Boolean) - ); - busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); - } function showOutletInfo(properties) { const key = "outlet_info"; @@ -647,6 +569,36 @@ } }; +function wsRouteToMapByName(properties) { + const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params; + const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"]; + _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); + busEmit(removeMapDatas.key, _keys_); + if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties); + let geojson = turf.featureCollection([]); + properties.forEach(p => { + let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name))); + geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},}))); + busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); + }) + newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson); + if(properties.length != 1) return; + let [features_point, features_point1, features_point2] = [[], [], []]; + let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0]; + if (["2", "3"].includes(properties[0].level)) { + let kk = _.replace(_keys_[4], /\d+/g, ""); + features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + } + features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + let geojson1 = turf.featureCollection([ + ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})), + ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})), + ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },})) + ].flat().filter(Boolean) + ); + busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); +} function clearRouteMethod() { const { removeMapDatas } = events_params; const _keys = [ @@ -1172,6 +1124,7 @@ trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap }, clearTrajectory: { key: "clearTrajectory", method: clearTrajectory }, clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData }, + wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName }, load3DTiles: { key: "load3DTiles", method: load3DTiles }, remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles }, isOpenPanorama: { diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 3dfbd82..7e225da 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -131,9 +131,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : ''; } else { return; } @@ -186,10 +184,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.dataID = Getproperties.value.stCode; - dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : ''; } else { return; } @@ -260,8 +255,9 @@ } // debugger; let params = { - dataCode: specificFun(type) || type, - scene: 'basis_monitor', + dataCode: type, + scene: specificFun(type) || 'basis_monitor', + // scene: "basis_monitor", dataId: dataId, }; drainageDispatchGetMenu(params).then(res => { @@ -372,6 +368,7 @@ console.log('经纬度', lngLat); console.log('数据', properties); console.log('layerid', layerId); + dialogConfig.title = properties.stName || properties.name; // 处理标注 Getproperties.value = properties; @@ -474,6 +471,7 @@ dialogConfig.visible = is; }; function anotherMeht(item) { + debugger; let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 97f0cf3..9ecae08 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -14,22 +14,22 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '排水户统计' - : AllData.regionGrade == 'two' - ? '排水户统计' - : AllData.regionGrade == 'three' - ? '排水户统计' - : AllData.regionGrade == 'four' - ? '水量统计' - : '' + AllData.regionGrade == "one" + ? "排水户统计" + : AllData.regionGrade == "two" + ? "排水户统计" + : AllData.regionGrade == "three" + ? "排水户统计" + : AllData.regionGrade == "four" + ? "水量统计" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
@@ -50,15 +50,15 @@
{{ - AllData.regionGrade == 'one' - ? '管网统计' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '排水类别' - : AllData.regionGrade == 'four' - ? '排水类别' - : '' + AllData.regionGrade == "one" + ? "管网统计" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "排水类别" + : AllData.regionGrade == "four" + ? "排水类别" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -79,15 +79,15 @@
{{ - AllData.regionGrade == 'one' - ? '日污水水量' - : AllData.regionGrade == 'two' - ? '日污水水量' - : AllData.regionGrade == 'three' - ? '日水量统计' - : AllData.regionGrade == 'four' - ? '管网统计' - : '' + AllData.regionGrade == "one" + ? "日污水水量" + : AllData.regionGrade == "two" + ? "日污水水量" + : AllData.regionGrade == "three" + ? "日水量统计" + : AllData.regionGrade == "four" + ? "管网统计" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -110,11 +110,17 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -138,7 +147,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -153,62 +165,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -219,15 +237,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -235,71 +263,71 @@ @@ -1075,7 +1148,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1100,6 +1173,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1136,7 +1210,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 62c4098..6ada224 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -14,28 +14,32 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '河湖水情' - : AllData.regionGrade == 'two' - ? '管网监测' - : AllData.regionGrade == 'three' - ? '管网统计' - : AllData.regionGrade == 'four' - ? '当日水量分析' - : '' + AllData.regionGrade == "one" + ? "河湖水情" + : AllData.regionGrade == "two" + ? "管网监测" + : AllData.regionGrade == "three" + ? "管网统计" + : AllData.regionGrade == "four" + ? "当日水量分析" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '流域管网' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '当日水量分析' - : AllData.regionGrade == 'four' - ? '渍水风险点' - : '' + AllData.regionGrade == "one" + ? "流域管网" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "当日水量分析" + : AllData.regionGrade == "four" + ? "渍水风险点" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '河湖排口' - : AllData.regionGrade == 'two' - ? '湖泊排口' - : AllData.regionGrade == 'three' - ? '渍水风险点' - : AllData.regionGrade == 'four' - ? '历史风险' - : '' + AllData.regionGrade == "one" + ? "河湖排口" + : AllData.regionGrade == "two" + ? "湖泊排口" + : AllData.regionGrade == "three" + ? "渍水风险点" + : AllData.regionGrade == "four" + ? "历史风险" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -142,7 +163,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -151,8 +175,13 @@
- - {{ AllData.SLFX.downstreamSiteWaterYield }} + + {{ + AllData.SLFX.downstreamSiteWaterYield + }} 万吨
@@ -166,62 +195,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -232,15 +267,25 @@
港渠统计 水质统计
- - + +
@@ -248,15 +293,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -264,75 +319,75 @@ @@ -1183,7 +1286,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1208,6 +1311,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1244,7 +1348,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; .SlList1P { diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue index aa58be6..fea3dc3 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue @@ -2,7 +2,7 @@
-
历史水质
+
历史水质
{ - Object.keys(geojson).forEach( - (key) => map.getSource(key) && map.getSource(key).setData(geojson[key]) - ); + const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches); + Object.keys(geojson).forEach((key) => { + map.getSource(key) && map.getSource(key).setData(geojson[key]); + cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles()); + console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key))); + }); map.triggerRepaint(); }; diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 5b05425..1df1977 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -351,19 +351,19 @@ ({ 1: () => { !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init); - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 2: () => { - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 3: () => { [ () => { - wsRouteToMapByName(properties); + wsRouteToMapByName([properties]); }, () => { const _keys_ = [ @@ -427,85 +427,7 @@ psfq.prevIds.push(properties); } - function wsRouteToMapByName(properties) { - const _keys_ = [ - "污水系统流向1", - "污水系统流向", - "1_泵站", - "1_污水处理厂", - "sewage_pipeline_quality1", - "sewage_pump_station_info1", - "storage_tank_info1", - ]; - _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); - busEmit(removeMapDatas.key, _keys_); - let features = _.cloneDeep( - ws_routeGeoJSON.features.filter((i) => - i.properties.bind.split(",").includes(properties.name) - ) - ); - let geojson = turf.featureCollection( - features.map((i) => - Object.assign(i, { - properties: { - ...i.properties, - name: i.properties.name, - type: i.properties._type || "污水系统流向1", - color: "rgb(255,74,25)", - width: [0, 7, 5, 3][properties.level], - }, - }) - ) - ); - newfiberMap - .getLayers() - .filter((i) => i.newfiberId == _keys_[1])[0] - .setData(geojson); - busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); - let [features_point, features_point1, features_point2] = [[], [], []]; - let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0]; - if (["2", "3"].includes(properties.level)) { - let kk = _.replace(_keys_[4], /\d+/g, ""); - features_point = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => i.properties.type.includes(kk)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - features_point1 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[5].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - } - features_point2 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[6].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - let geojson1 = turf.featureCollection( - [ - ...features_point.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[4] }, - })), - ...features_point1.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[5] }, - })), - ...features_point2.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[6] }, - })), - ] - .flat() - .filter(Boolean) - ); - busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); - } function showOutletInfo(properties) { const key = "outlet_info"; @@ -647,6 +569,36 @@ } }; +function wsRouteToMapByName(properties) { + const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params; + const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"]; + _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); + busEmit(removeMapDatas.key, _keys_); + if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties); + let geojson = turf.featureCollection([]); + properties.forEach(p => { + let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name))); + geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},}))); + busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); + }) + newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson); + if(properties.length != 1) return; + let [features_point, features_point1, features_point2] = [[], [], []]; + let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0]; + if (["2", "3"].includes(properties[0].level)) { + let kk = _.replace(_keys_[4], /\d+/g, ""); + features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + } + features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + let geojson1 = turf.featureCollection([ + ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})), + ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})), + ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },})) + ].flat().filter(Boolean) + ); + busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); +} function clearRouteMethod() { const { removeMapDatas } = events_params; const _keys = [ @@ -1172,6 +1124,7 @@ trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap }, clearTrajectory: { key: "clearTrajectory", method: clearTrajectory }, clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData }, + wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName }, load3DTiles: { key: "load3DTiles", method: load3DTiles }, remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles }, isOpenPanorama: { diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 3dfbd82..7e225da 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -131,9 +131,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : ''; } else { return; } @@ -186,10 +184,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.dataID = Getproperties.value.stCode; - dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : ''; } else { return; } @@ -260,8 +255,9 @@ } // debugger; let params = { - dataCode: specificFun(type) || type, - scene: 'basis_monitor', + dataCode: type, + scene: specificFun(type) || 'basis_monitor', + // scene: "basis_monitor", dataId: dataId, }; drainageDispatchGetMenu(params).then(res => { @@ -372,6 +368,7 @@ console.log('经纬度', lngLat); console.log('数据', properties); console.log('layerid', layerId); + dialogConfig.title = properties.stName || properties.name; // 处理标注 Getproperties.value = properties; @@ -474,6 +471,7 @@ dialogConfig.visible = is; }; function anotherMeht(item) { + debugger; let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 97f0cf3..9ecae08 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -14,22 +14,22 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '排水户统计' - : AllData.regionGrade == 'two' - ? '排水户统计' - : AllData.regionGrade == 'three' - ? '排水户统计' - : AllData.regionGrade == 'four' - ? '水量统计' - : '' + AllData.regionGrade == "one" + ? "排水户统计" + : AllData.regionGrade == "two" + ? "排水户统计" + : AllData.regionGrade == "three" + ? "排水户统计" + : AllData.regionGrade == "four" + ? "水量统计" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
@@ -50,15 +50,15 @@
{{ - AllData.regionGrade == 'one' - ? '管网统计' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '排水类别' - : AllData.regionGrade == 'four' - ? '排水类别' - : '' + AllData.regionGrade == "one" + ? "管网统计" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "排水类别" + : AllData.regionGrade == "four" + ? "排水类别" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -79,15 +79,15 @@
{{ - AllData.regionGrade == 'one' - ? '日污水水量' - : AllData.regionGrade == 'two' - ? '日污水水量' - : AllData.regionGrade == 'three' - ? '日水量统计' - : AllData.regionGrade == 'four' - ? '管网统计' - : '' + AllData.regionGrade == "one" + ? "日污水水量" + : AllData.regionGrade == "two" + ? "日污水水量" + : AllData.regionGrade == "three" + ? "日水量统计" + : AllData.regionGrade == "four" + ? "管网统计" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -110,11 +110,17 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -138,7 +147,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -153,62 +165,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -219,15 +237,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -235,71 +263,71 @@ @@ -1075,7 +1148,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1100,6 +1173,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1136,7 +1210,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 62c4098..6ada224 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -14,28 +14,32 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '河湖水情' - : AllData.regionGrade == 'two' - ? '管网监测' - : AllData.regionGrade == 'three' - ? '管网统计' - : AllData.regionGrade == 'four' - ? '当日水量分析' - : '' + AllData.regionGrade == "one" + ? "河湖水情" + : AllData.regionGrade == "two" + ? "管网监测" + : AllData.regionGrade == "three" + ? "管网统计" + : AllData.regionGrade == "four" + ? "当日水量分析" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '流域管网' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '当日水量分析' - : AllData.regionGrade == 'four' - ? '渍水风险点' - : '' + AllData.regionGrade == "one" + ? "流域管网" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "当日水量分析" + : AllData.regionGrade == "four" + ? "渍水风险点" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '河湖排口' - : AllData.regionGrade == 'two' - ? '湖泊排口' - : AllData.regionGrade == 'three' - ? '渍水风险点' - : AllData.regionGrade == 'four' - ? '历史风险' - : '' + AllData.regionGrade == "one" + ? "河湖排口" + : AllData.regionGrade == "two" + ? "湖泊排口" + : AllData.regionGrade == "three" + ? "渍水风险点" + : AllData.regionGrade == "four" + ? "历史风险" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -142,7 +163,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -151,8 +175,13 @@
- - {{ AllData.SLFX.downstreamSiteWaterYield }} + + {{ + AllData.SLFX.downstreamSiteWaterYield + }} 万吨
@@ -166,62 +195,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -232,15 +267,25 @@
港渠统计 水质统计
- - + +
@@ -248,15 +293,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -264,75 +319,75 @@ @@ -1183,7 +1286,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1208,6 +1311,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1244,7 +1348,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; .SlList1P { diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue index aa58be6..fea3dc3 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue @@ -2,7 +2,7 @@
-
历史水质
+
历史水质
{ - Object.keys(geojson).forEach( - (key) => map.getSource(key) && map.getSource(key).setData(geojson[key]) - ); + const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches); + Object.keys(geojson).forEach((key) => { + map.getSource(key) && map.getSource(key).setData(geojson[key]); + cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles()); + console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key))); + }); map.triggerRepaint(); }; diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 5b05425..1df1977 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -351,19 +351,19 @@ ({ 1: () => { !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init); - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 2: () => { - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 3: () => { [ () => { - wsRouteToMapByName(properties); + wsRouteToMapByName([properties]); }, () => { const _keys_ = [ @@ -427,85 +427,7 @@ psfq.prevIds.push(properties); } - function wsRouteToMapByName(properties) { - const _keys_ = [ - "污水系统流向1", - "污水系统流向", - "1_泵站", - "1_污水处理厂", - "sewage_pipeline_quality1", - "sewage_pump_station_info1", - "storage_tank_info1", - ]; - _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); - busEmit(removeMapDatas.key, _keys_); - let features = _.cloneDeep( - ws_routeGeoJSON.features.filter((i) => - i.properties.bind.split(",").includes(properties.name) - ) - ); - let geojson = turf.featureCollection( - features.map((i) => - Object.assign(i, { - properties: { - ...i.properties, - name: i.properties.name, - type: i.properties._type || "污水系统流向1", - color: "rgb(255,74,25)", - width: [0, 7, 5, 3][properties.level], - }, - }) - ) - ); - newfiberMap - .getLayers() - .filter((i) => i.newfiberId == _keys_[1])[0] - .setData(geojson); - busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); - let [features_point, features_point1, features_point2] = [[], [], []]; - let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0]; - if (["2", "3"].includes(properties.level)) { - let kk = _.replace(_keys_[4], /\d+/g, ""); - features_point = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => i.properties.type.includes(kk)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - features_point1 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[5].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - } - features_point2 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[6].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - let geojson1 = turf.featureCollection( - [ - ...features_point.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[4] }, - })), - ...features_point1.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[5] }, - })), - ...features_point2.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[6] }, - })), - ] - .flat() - .filter(Boolean) - ); - busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); - } function showOutletInfo(properties) { const key = "outlet_info"; @@ -647,6 +569,36 @@ } }; +function wsRouteToMapByName(properties) { + const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params; + const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"]; + _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); + busEmit(removeMapDatas.key, _keys_); + if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties); + let geojson = turf.featureCollection([]); + properties.forEach(p => { + let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name))); + geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},}))); + busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); + }) + newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson); + if(properties.length != 1) return; + let [features_point, features_point1, features_point2] = [[], [], []]; + let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0]; + if (["2", "3"].includes(properties[0].level)) { + let kk = _.replace(_keys_[4], /\d+/g, ""); + features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + } + features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + let geojson1 = turf.featureCollection([ + ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})), + ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})), + ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },})) + ].flat().filter(Boolean) + ); + busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); +} function clearRouteMethod() { const { removeMapDatas } = events_params; const _keys = [ @@ -1172,6 +1124,7 @@ trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap }, clearTrajectory: { key: "clearTrajectory", method: clearTrajectory }, clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData }, + wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName }, load3DTiles: { key: "load3DTiles", method: load3DTiles }, remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles }, isOpenPanorama: { diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 3dfbd82..7e225da 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -131,9 +131,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : ''; } else { return; } @@ -186,10 +184,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.dataID = Getproperties.value.stCode; - dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : ''; } else { return; } @@ -260,8 +255,9 @@ } // debugger; let params = { - dataCode: specificFun(type) || type, - scene: 'basis_monitor', + dataCode: type, + scene: specificFun(type) || 'basis_monitor', + // scene: "basis_monitor", dataId: dataId, }; drainageDispatchGetMenu(params).then(res => { @@ -372,6 +368,7 @@ console.log('经纬度', lngLat); console.log('数据', properties); console.log('layerid', layerId); + dialogConfig.title = properties.stName || properties.name; // 处理标注 Getproperties.value = properties; @@ -474,6 +471,7 @@ dialogConfig.visible = is; }; function anotherMeht(item) { + debugger; let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 97f0cf3..9ecae08 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -14,22 +14,22 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '排水户统计' - : AllData.regionGrade == 'two' - ? '排水户统计' - : AllData.regionGrade == 'three' - ? '排水户统计' - : AllData.regionGrade == 'four' - ? '水量统计' - : '' + AllData.regionGrade == "one" + ? "排水户统计" + : AllData.regionGrade == "two" + ? "排水户统计" + : AllData.regionGrade == "three" + ? "排水户统计" + : AllData.regionGrade == "four" + ? "水量统计" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
@@ -50,15 +50,15 @@
{{ - AllData.regionGrade == 'one' - ? '管网统计' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '排水类别' - : AllData.regionGrade == 'four' - ? '排水类别' - : '' + AllData.regionGrade == "one" + ? "管网统计" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "排水类别" + : AllData.regionGrade == "four" + ? "排水类别" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -79,15 +79,15 @@
{{ - AllData.regionGrade == 'one' - ? '日污水水量' - : AllData.regionGrade == 'two' - ? '日污水水量' - : AllData.regionGrade == 'three' - ? '日水量统计' - : AllData.regionGrade == 'four' - ? '管网统计' - : '' + AllData.regionGrade == "one" + ? "日污水水量" + : AllData.regionGrade == "two" + ? "日污水水量" + : AllData.regionGrade == "three" + ? "日水量统计" + : AllData.regionGrade == "four" + ? "管网统计" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -110,11 +110,17 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -138,7 +147,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -153,62 +165,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -219,15 +237,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -235,71 +263,71 @@ @@ -1075,7 +1148,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1100,6 +1173,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1136,7 +1210,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 62c4098..6ada224 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -14,28 +14,32 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '河湖水情' - : AllData.regionGrade == 'two' - ? '管网监测' - : AllData.regionGrade == 'three' - ? '管网统计' - : AllData.regionGrade == 'four' - ? '当日水量分析' - : '' + AllData.regionGrade == "one" + ? "河湖水情" + : AllData.regionGrade == "two" + ? "管网监测" + : AllData.regionGrade == "three" + ? "管网统计" + : AllData.regionGrade == "four" + ? "当日水量分析" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '流域管网' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '当日水量分析' - : AllData.regionGrade == 'four' - ? '渍水风险点' - : '' + AllData.regionGrade == "one" + ? "流域管网" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "当日水量分析" + : AllData.regionGrade == "four" + ? "渍水风险点" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '河湖排口' - : AllData.regionGrade == 'two' - ? '湖泊排口' - : AllData.regionGrade == 'three' - ? '渍水风险点' - : AllData.regionGrade == 'four' - ? '历史风险' - : '' + AllData.regionGrade == "one" + ? "河湖排口" + : AllData.regionGrade == "two" + ? "湖泊排口" + : AllData.regionGrade == "three" + ? "渍水风险点" + : AllData.regionGrade == "four" + ? "历史风险" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -142,7 +163,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -151,8 +175,13 @@
- - {{ AllData.SLFX.downstreamSiteWaterYield }} + + {{ + AllData.SLFX.downstreamSiteWaterYield + }} 万吨
@@ -166,62 +195,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -232,15 +267,25 @@
港渠统计 水质统计
- - + +
@@ -248,15 +293,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -264,75 +319,75 @@ @@ -1183,7 +1286,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1208,6 +1311,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1244,7 +1348,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; .SlList1P { diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue index aa58be6..fea3dc3 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue @@ -2,7 +2,7 @@
-
历史水质
+
历史水质
{ + const { setLayerVisible, clearTemporaryData,wsRouteToMapByName } = events_params; closeAllLayer(); - bus.emit("clearTemporaryData"); - const { setLayerVisible } = events_params; + bus.emit(clearTemporaryData.key); newfiberMap.map.easeTo(newfiberMap.config_.params.init); - item.values && - item.values - .filter((i) => i.visible) - .forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); + item.values && item.values.filter((i) => i.visible).forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); + item.key == 'sewage' && bus.emit(wsRouteToMapByName.key); }; const events_params = { setHighlight: { key: "setHighlight" }, setLayerVisible: { key: "setLayerVisible" }, clearTemporaryData: { key: "clearTemporaryData" }, + wsRouteToMapByName: { key: "wsRouteToMapByName" }, }; const closeAllLayer = () => { const { setLayerVisible, setHighlight } = events_params; - AllData.yw_type - .map((i) => i.values) - .filter(Boolean) - .flat() - .forEach((i) => - bus.emit(setLayerVisible.key, { - layername: i.key, - isCheck: false, - values: i.values, - }) - ); + AllData.yw_type.map((i) => i.values).filter(Boolean).flat().forEach((i) => bus.emit(setLayerVisible.key, {layername: i.key, isCheck: false, values: i.values,})); bus.emit(setHighlight.key, []); }; diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index bdf6856..770f52a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,30 +18,30 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap8.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap9.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap10.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap11.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap12.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap13.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap14.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap15.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://dhgx0.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx1.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx3.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx2.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx4.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx5.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx6.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx8.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx9.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx10.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx11.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx12.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx13.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx14.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx15.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 } }, - "sprite": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/sprite", - "glyphs": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/fonts/{fontstack}/{range}.pbf", + "sprite": "https://dhgx12.wh-nf.cn:7081/bm/static/map/style/sprite", + "glyphs": "https://dhgx10.wh-nf.cn:7081/bm/static/map/style/fonts/{fontstack}/{range}.pbf", "layers": [ { "id": "background", diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ed18e3d..45e161c 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,25 +1,25 @@ { "params": { - "basemap": "https://supermap2.wh-nf.cn:8090/bm", + "basemap": "https://dhgx19.wh-nf.cn:7081/bm", "mvt": [ - "https://supermap0.wh-nf.cn:8090/vt/mvt", - "https://supermap1.wh-nf.cn:8090/vt/mvt", - "https://supermap2.wh-nf.cn:8090/vt/mvt", - "https://supermap3.wh-nf.cn:8090/vt/mvt", - "https://supermap4.wh-nf.cn:8090/vt/mvt", - "https://supermap5.wh-nf.cn:8090/vt/mvt", - "https://supermap6.wh-nf.cn:8090/vt/mvt", - "https://supermap7.wh-nf.cn:8090/vt/mvt", - "https://supermap8.wh-nf.cn:8090/vt/mvt", - "https://supermap9.wh-nf.cn:8090/vt/mvt", - "https://supermap10.wh-nf.cn:8090/vt/mvt", - "https://supermap11.wh-nf.cn:8090/vt/mvt", - "https://supermap12.wh-nf.cn:8090/vt/mvt", - "https://supermap13.wh-nf.cn:8090/vt/mvt", - "https://supermap14.wh-nf.cn:8090/vt/mvt", - "https://supermap15.wh-nf.cn:8090/vt/mvt" + "https://dhgx0.wh-nf.cn:7081/vt/mvt", + "https://dhgx1.wh-nf.cn:7081/vt/mvt", + "https://dhgx2.wh-nf.cn:7081/vt/mvt", + "https://dhgx3.wh-nf.cn:7081/vt/mvt", + "https://dhgx4.wh-nf.cn:7081/vt/mvt", + "https://dhgx5.wh-nf.cn:7081/vt/mvt", + "https://dhgx6.wh-nf.cn:7081/vt/mvt", + "https://dhgx7.wh-nf.cn:7081/vt/mvt", + "https://dhgx8.wh-nf.cn:7081/vt/mvt", + "https://dhgx9.wh-nf.cn:7081/vt/mvt", + "https://dhgx10.wh-nf.cn:7081/vt/mvt", + "https://dhgx11.wh-nf.cn:7081/vt/mvt", + "https://dhgx12.wh-nf.cn:7081/vt/mvt", + "https://dhgx13.wh-nf.cn:7081/vt/mvt", + "https://dhgx14.wh-nf.cn:7081/vt/mvt", + "https://dhgx15.wh-nf.cn:7081/vt/mvt" ], - "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", + "geojson": "https://dhgx9.wh-nf.cn:7081/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 2a6d65b..f94a395 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -534,9 +534,12 @@ }; const refreshGeoJSON = () => { - Object.keys(geojson).forEach( - (key) => map.getSource(key) && map.getSource(key).setData(geojson[key]) - ); + const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches); + Object.keys(geojson).forEach((key) => { + map.getSource(key) && map.getSource(key).setData(geojson[key]); + cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles()); + console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key))); + }); map.triggerRepaint(); }; diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 5b05425..1df1977 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -351,19 +351,19 @@ ({ 1: () => { !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init); - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 2: () => { - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 3: () => { [ () => { - wsRouteToMapByName(properties); + wsRouteToMapByName([properties]); }, () => { const _keys_ = [ @@ -427,85 +427,7 @@ psfq.prevIds.push(properties); } - function wsRouteToMapByName(properties) { - const _keys_ = [ - "污水系统流向1", - "污水系统流向", - "1_泵站", - "1_污水处理厂", - "sewage_pipeline_quality1", - "sewage_pump_station_info1", - "storage_tank_info1", - ]; - _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); - busEmit(removeMapDatas.key, _keys_); - let features = _.cloneDeep( - ws_routeGeoJSON.features.filter((i) => - i.properties.bind.split(",").includes(properties.name) - ) - ); - let geojson = turf.featureCollection( - features.map((i) => - Object.assign(i, { - properties: { - ...i.properties, - name: i.properties.name, - type: i.properties._type || "污水系统流向1", - color: "rgb(255,74,25)", - width: [0, 7, 5, 3][properties.level], - }, - }) - ) - ); - newfiberMap - .getLayers() - .filter((i) => i.newfiberId == _keys_[1])[0] - .setData(geojson); - busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); - let [features_point, features_point1, features_point2] = [[], [], []]; - let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0]; - if (["2", "3"].includes(properties.level)) { - let kk = _.replace(_keys_[4], /\d+/g, ""); - features_point = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => i.properties.type.includes(kk)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - features_point1 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[5].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - } - features_point2 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[6].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - let geojson1 = turf.featureCollection( - [ - ...features_point.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[4] }, - })), - ...features_point1.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[5] }, - })), - ...features_point2.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[6] }, - })), - ] - .flat() - .filter(Boolean) - ); - busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); - } function showOutletInfo(properties) { const key = "outlet_info"; @@ -647,6 +569,36 @@ } }; +function wsRouteToMapByName(properties) { + const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params; + const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"]; + _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); + busEmit(removeMapDatas.key, _keys_); + if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties); + let geojson = turf.featureCollection([]); + properties.forEach(p => { + let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name))); + geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},}))); + busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); + }) + newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson); + if(properties.length != 1) return; + let [features_point, features_point1, features_point2] = [[], [], []]; + let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0]; + if (["2", "3"].includes(properties[0].level)) { + let kk = _.replace(_keys_[4], /\d+/g, ""); + features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + } + features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + let geojson1 = turf.featureCollection([ + ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})), + ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})), + ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },})) + ].flat().filter(Boolean) + ); + busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); +} function clearRouteMethod() { const { removeMapDatas } = events_params; const _keys = [ @@ -1172,6 +1124,7 @@ trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap }, clearTrajectory: { key: "clearTrajectory", method: clearTrajectory }, clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData }, + wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName }, load3DTiles: { key: "load3DTiles", method: load3DTiles }, remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles }, isOpenPanorama: { diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 3dfbd82..7e225da 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -131,9 +131,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : ''; } else { return; } @@ -186,10 +184,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.dataID = Getproperties.value.stCode; - dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : ''; } else { return; } @@ -260,8 +255,9 @@ } // debugger; let params = { - dataCode: specificFun(type) || type, - scene: 'basis_monitor', + dataCode: type, + scene: specificFun(type) || 'basis_monitor', + // scene: "basis_monitor", dataId: dataId, }; drainageDispatchGetMenu(params).then(res => { @@ -372,6 +368,7 @@ console.log('经纬度', lngLat); console.log('数据', properties); console.log('layerid', layerId); + dialogConfig.title = properties.stName || properties.name; // 处理标注 Getproperties.value = properties; @@ -474,6 +471,7 @@ dialogConfig.visible = is; }; function anotherMeht(item) { + debugger; let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 97f0cf3..9ecae08 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -14,22 +14,22 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '排水户统计' - : AllData.regionGrade == 'two' - ? '排水户统计' - : AllData.regionGrade == 'three' - ? '排水户统计' - : AllData.regionGrade == 'four' - ? '水量统计' - : '' + AllData.regionGrade == "one" + ? "排水户统计" + : AllData.regionGrade == "two" + ? "排水户统计" + : AllData.regionGrade == "three" + ? "排水户统计" + : AllData.regionGrade == "four" + ? "水量统计" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
@@ -50,15 +50,15 @@
{{ - AllData.regionGrade == 'one' - ? '管网统计' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '排水类别' - : AllData.regionGrade == 'four' - ? '排水类别' - : '' + AllData.regionGrade == "one" + ? "管网统计" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "排水类别" + : AllData.regionGrade == "four" + ? "排水类别" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -79,15 +79,15 @@
{{ - AllData.regionGrade == 'one' - ? '日污水水量' - : AllData.regionGrade == 'two' - ? '日污水水量' - : AllData.regionGrade == 'three' - ? '日水量统计' - : AllData.regionGrade == 'four' - ? '管网统计' - : '' + AllData.regionGrade == "one" + ? "日污水水量" + : AllData.regionGrade == "two" + ? "日污水水量" + : AllData.regionGrade == "three" + ? "日水量统计" + : AllData.regionGrade == "four" + ? "管网统计" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -110,11 +110,17 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -138,7 +147,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -153,62 +165,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -219,15 +237,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -235,71 +263,71 @@ @@ -1075,7 +1148,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1100,6 +1173,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1136,7 +1210,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 62c4098..6ada224 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -14,28 +14,32 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '河湖水情' - : AllData.regionGrade == 'two' - ? '管网监测' - : AllData.regionGrade == 'three' - ? '管网统计' - : AllData.regionGrade == 'four' - ? '当日水量分析' - : '' + AllData.regionGrade == "one" + ? "河湖水情" + : AllData.regionGrade == "two" + ? "管网监测" + : AllData.regionGrade == "three" + ? "管网统计" + : AllData.regionGrade == "four" + ? "当日水量分析" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '流域管网' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '当日水量分析' - : AllData.regionGrade == 'four' - ? '渍水风险点' - : '' + AllData.regionGrade == "one" + ? "流域管网" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "当日水量分析" + : AllData.regionGrade == "four" + ? "渍水风险点" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '河湖排口' - : AllData.regionGrade == 'two' - ? '湖泊排口' - : AllData.regionGrade == 'three' - ? '渍水风险点' - : AllData.regionGrade == 'four' - ? '历史风险' - : '' + AllData.regionGrade == "one" + ? "河湖排口" + : AllData.regionGrade == "two" + ? "湖泊排口" + : AllData.regionGrade == "three" + ? "渍水风险点" + : AllData.regionGrade == "four" + ? "历史风险" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -142,7 +163,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -151,8 +175,13 @@
- - {{ AllData.SLFX.downstreamSiteWaterYield }} + + {{ + AllData.SLFX.downstreamSiteWaterYield + }} 万吨
@@ -166,62 +195,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -232,15 +267,25 @@
港渠统计 水质统计
- - + +
@@ -248,15 +293,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -264,75 +319,75 @@ @@ -1183,7 +1286,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1208,6 +1311,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1244,7 +1348,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; .SlList1P { diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue index aa58be6..fea3dc3 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue @@ -2,7 +2,7 @@
-
历史水质
+
历史水质
{ + const { setLayerVisible, clearTemporaryData,wsRouteToMapByName } = events_params; closeAllLayer(); - bus.emit("clearTemporaryData"); - const { setLayerVisible } = events_params; + bus.emit(clearTemporaryData.key); newfiberMap.map.easeTo(newfiberMap.config_.params.init); - item.values && - item.values - .filter((i) => i.visible) - .forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); + item.values && item.values.filter((i) => i.visible).forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); + item.key == 'sewage' && bus.emit(wsRouteToMapByName.key); }; const events_params = { setHighlight: { key: "setHighlight" }, setLayerVisible: { key: "setLayerVisible" }, clearTemporaryData: { key: "clearTemporaryData" }, + wsRouteToMapByName: { key: "wsRouteToMapByName" }, }; const closeAllLayer = () => { const { setLayerVisible, setHighlight } = events_params; - AllData.yw_type - .map((i) => i.values) - .filter(Boolean) - .flat() - .forEach((i) => - bus.emit(setLayerVisible.key, { - layername: i.key, - isCheck: false, - values: i.values, - }) - ); + AllData.yw_type.map((i) => i.values).filter(Boolean).flat().forEach((i) => bus.emit(setLayerVisible.key, {layername: i.key, isCheck: false, values: i.values,})); bus.emit(setHighlight.key, []); }; diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue index 1a68d0c..e4ca055 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue @@ -775,6 +775,7 @@ } } // 赋值需要进行echarts数据请求的数据 + // debugger; AllData.regionGrade = res.data.length == 1 ? "two" @@ -823,7 +824,7 @@ */ const GetData = (queryType) => { if (AllData.regionGrade == "five") return; - if (AllData.regionGrade == "four" && AllData.TypeID == "rain") return; + // if (AllData.regionGrade == "four" && AllData.TypeID == "rain") return; let params = { regionGrade: AllData.regionGrade, regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水） diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index bdf6856..770f52a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,30 +18,30 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap8.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap9.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap10.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap11.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap12.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap13.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap14.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap15.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://dhgx0.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx1.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx3.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx2.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx4.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx5.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx6.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx8.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx9.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx10.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx11.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx12.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx13.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx14.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx15.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 } }, - "sprite": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/sprite", - "glyphs": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/fonts/{fontstack}/{range}.pbf", + "sprite": "https://dhgx12.wh-nf.cn:7081/bm/static/map/style/sprite", + "glyphs": "https://dhgx10.wh-nf.cn:7081/bm/static/map/style/fonts/{fontstack}/{range}.pbf", "layers": [ { "id": "background", diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ed18e3d..45e161c 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,25 +1,25 @@ { "params": { - "basemap": "https://supermap2.wh-nf.cn:8090/bm", + "basemap": "https://dhgx19.wh-nf.cn:7081/bm", "mvt": [ - "https://supermap0.wh-nf.cn:8090/vt/mvt", - "https://supermap1.wh-nf.cn:8090/vt/mvt", - "https://supermap2.wh-nf.cn:8090/vt/mvt", - "https://supermap3.wh-nf.cn:8090/vt/mvt", - "https://supermap4.wh-nf.cn:8090/vt/mvt", - "https://supermap5.wh-nf.cn:8090/vt/mvt", - "https://supermap6.wh-nf.cn:8090/vt/mvt", - "https://supermap7.wh-nf.cn:8090/vt/mvt", - "https://supermap8.wh-nf.cn:8090/vt/mvt", - "https://supermap9.wh-nf.cn:8090/vt/mvt", - "https://supermap10.wh-nf.cn:8090/vt/mvt", - "https://supermap11.wh-nf.cn:8090/vt/mvt", - "https://supermap12.wh-nf.cn:8090/vt/mvt", - "https://supermap13.wh-nf.cn:8090/vt/mvt", - "https://supermap14.wh-nf.cn:8090/vt/mvt", - "https://supermap15.wh-nf.cn:8090/vt/mvt" + "https://dhgx0.wh-nf.cn:7081/vt/mvt", + "https://dhgx1.wh-nf.cn:7081/vt/mvt", + "https://dhgx2.wh-nf.cn:7081/vt/mvt", + "https://dhgx3.wh-nf.cn:7081/vt/mvt", + "https://dhgx4.wh-nf.cn:7081/vt/mvt", + "https://dhgx5.wh-nf.cn:7081/vt/mvt", + "https://dhgx6.wh-nf.cn:7081/vt/mvt", + "https://dhgx7.wh-nf.cn:7081/vt/mvt", + "https://dhgx8.wh-nf.cn:7081/vt/mvt", + "https://dhgx9.wh-nf.cn:7081/vt/mvt", + "https://dhgx10.wh-nf.cn:7081/vt/mvt", + "https://dhgx11.wh-nf.cn:7081/vt/mvt", + "https://dhgx12.wh-nf.cn:7081/vt/mvt", + "https://dhgx13.wh-nf.cn:7081/vt/mvt", + "https://dhgx14.wh-nf.cn:7081/vt/mvt", + "https://dhgx15.wh-nf.cn:7081/vt/mvt" ], - "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", + "geojson": "https://dhgx9.wh-nf.cn:7081/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 2a6d65b..f94a395 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -534,9 +534,12 @@ }; const refreshGeoJSON = () => { - Object.keys(geojson).forEach( - (key) => map.getSource(key) && map.getSource(key).setData(geojson[key]) - ); + const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches); + Object.keys(geojson).forEach((key) => { + map.getSource(key) && map.getSource(key).setData(geojson[key]); + cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles()); + console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key))); + }); map.triggerRepaint(); }; diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 5b05425..1df1977 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -351,19 +351,19 @@ ({ 1: () => { !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init); - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 2: () => { - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 3: () => { [ () => { - wsRouteToMapByName(properties); + wsRouteToMapByName([properties]); }, () => { const _keys_ = [ @@ -427,85 +427,7 @@ psfq.prevIds.push(properties); } - function wsRouteToMapByName(properties) { - const _keys_ = [ - "污水系统流向1", - "污水系统流向", - "1_泵站", - "1_污水处理厂", - "sewage_pipeline_quality1", - "sewage_pump_station_info1", - "storage_tank_info1", - ]; - _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); - busEmit(removeMapDatas.key, _keys_); - let features = _.cloneDeep( - ws_routeGeoJSON.features.filter((i) => - i.properties.bind.split(",").includes(properties.name) - ) - ); - let geojson = turf.featureCollection( - features.map((i) => - Object.assign(i, { - properties: { - ...i.properties, - name: i.properties.name, - type: i.properties._type || "污水系统流向1", - color: "rgb(255,74,25)", - width: [0, 7, 5, 3][properties.level], - }, - }) - ) - ); - newfiberMap - .getLayers() - .filter((i) => i.newfiberId == _keys_[1])[0] - .setData(geojson); - busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); - let [features_point, features_point1, features_point2] = [[], [], []]; - let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0]; - if (["2", "3"].includes(properties.level)) { - let kk = _.replace(_keys_[4], /\d+/g, ""); - features_point = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => i.properties.type.includes(kk)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - features_point1 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[5].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - } - features_point2 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[6].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - let geojson1 = turf.featureCollection( - [ - ...features_point.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[4] }, - })), - ...features_point1.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[5] }, - })), - ...features_point2.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[6] }, - })), - ] - .flat() - .filter(Boolean) - ); - busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); - } function showOutletInfo(properties) { const key = "outlet_info"; @@ -647,6 +569,36 @@ } }; +function wsRouteToMapByName(properties) { + const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params; + const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"]; + _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); + busEmit(removeMapDatas.key, _keys_); + if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties); + let geojson = turf.featureCollection([]); + properties.forEach(p => { + let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name))); + geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},}))); + busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); + }) + newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson); + if(properties.length != 1) return; + let [features_point, features_point1, features_point2] = [[], [], []]; + let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0]; + if (["2", "3"].includes(properties[0].level)) { + let kk = _.replace(_keys_[4], /\d+/g, ""); + features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + } + features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + let geojson1 = turf.featureCollection([ + ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})), + ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})), + ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },})) + ].flat().filter(Boolean) + ); + busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); +} function clearRouteMethod() { const { removeMapDatas } = events_params; const _keys = [ @@ -1172,6 +1124,7 @@ trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap }, clearTrajectory: { key: "clearTrajectory", method: clearTrajectory }, clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData }, + wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName }, load3DTiles: { key: "load3DTiles", method: load3DTiles }, remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles }, isOpenPanorama: { diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 3dfbd82..7e225da 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -131,9 +131,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : ''; } else { return; } @@ -186,10 +184,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.dataID = Getproperties.value.stCode; - dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : ''; } else { return; } @@ -260,8 +255,9 @@ } // debugger; let params = { - dataCode: specificFun(type) || type, - scene: 'basis_monitor', + dataCode: type, + scene: specificFun(type) || 'basis_monitor', + // scene: "basis_monitor", dataId: dataId, }; drainageDispatchGetMenu(params).then(res => { @@ -372,6 +368,7 @@ console.log('经纬度', lngLat); console.log('数据', properties); console.log('layerid', layerId); + dialogConfig.title = properties.stName || properties.name; // 处理标注 Getproperties.value = properties; @@ -474,6 +471,7 @@ dialogConfig.visible = is; }; function anotherMeht(item) { + debugger; let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 97f0cf3..9ecae08 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -14,22 +14,22 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '排水户统计' - : AllData.regionGrade == 'two' - ? '排水户统计' - : AllData.regionGrade == 'three' - ? '排水户统计' - : AllData.regionGrade == 'four' - ? '水量统计' - : '' + AllData.regionGrade == "one" + ? "排水户统计" + : AllData.regionGrade == "two" + ? "排水户统计" + : AllData.regionGrade == "three" + ? "排水户统计" + : AllData.regionGrade == "four" + ? "水量统计" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
@@ -50,15 +50,15 @@
{{ - AllData.regionGrade == 'one' - ? '管网统计' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '排水类别' - : AllData.regionGrade == 'four' - ? '排水类别' - : '' + AllData.regionGrade == "one" + ? "管网统计" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "排水类别" + : AllData.regionGrade == "four" + ? "排水类别" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -79,15 +79,15 @@
{{ - AllData.regionGrade == 'one' - ? '日污水水量' - : AllData.regionGrade == 'two' - ? '日污水水量' - : AllData.regionGrade == 'three' - ? '日水量统计' - : AllData.regionGrade == 'four' - ? '管网统计' - : '' + AllData.regionGrade == "one" + ? "日污水水量" + : AllData.regionGrade == "two" + ? "日污水水量" + : AllData.regionGrade == "three" + ? "日水量统计" + : AllData.regionGrade == "four" + ? "管网统计" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -110,11 +110,17 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -138,7 +147,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -153,62 +165,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -219,15 +237,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -235,71 +263,71 @@ @@ -1075,7 +1148,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1100,6 +1173,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1136,7 +1210,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 62c4098..6ada224 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -14,28 +14,32 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '河湖水情' - : AllData.regionGrade == 'two' - ? '管网监测' - : AllData.regionGrade == 'three' - ? '管网统计' - : AllData.regionGrade == 'four' - ? '当日水量分析' - : '' + AllData.regionGrade == "one" + ? "河湖水情" + : AllData.regionGrade == "two" + ? "管网监测" + : AllData.regionGrade == "three" + ? "管网统计" + : AllData.regionGrade == "four" + ? "当日水量分析" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '流域管网' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '当日水量分析' - : AllData.regionGrade == 'four' - ? '渍水风险点' - : '' + AllData.regionGrade == "one" + ? "流域管网" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "当日水量分析" + : AllData.regionGrade == "four" + ? "渍水风险点" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '河湖排口' - : AllData.regionGrade == 'two' - ? '湖泊排口' - : AllData.regionGrade == 'three' - ? '渍水风险点' - : AllData.regionGrade == 'four' - ? '历史风险' - : '' + AllData.regionGrade == "one" + ? "河湖排口" + : AllData.regionGrade == "two" + ? "湖泊排口" + : AllData.regionGrade == "three" + ? "渍水风险点" + : AllData.regionGrade == "four" + ? "历史风险" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -142,7 +163,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -151,8 +175,13 @@
- - {{ AllData.SLFX.downstreamSiteWaterYield }} + + {{ + AllData.SLFX.downstreamSiteWaterYield + }} 万吨
@@ -166,62 +195,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -232,15 +267,25 @@
港渠统计 水质统计
- - + +
@@ -248,15 +293,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -264,75 +319,75 @@ @@ -1183,7 +1286,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1208,6 +1311,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1244,7 +1348,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; .SlList1P { diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue index aa58be6..fea3dc3 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue @@ -2,7 +2,7 @@
-
历史水质
+
历史水质
{ + const { setLayerVisible, clearTemporaryData,wsRouteToMapByName } = events_params; closeAllLayer(); - bus.emit("clearTemporaryData"); - const { setLayerVisible } = events_params; + bus.emit(clearTemporaryData.key); newfiberMap.map.easeTo(newfiberMap.config_.params.init); - item.values && - item.values - .filter((i) => i.visible) - .forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); + item.values && item.values.filter((i) => i.visible).forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); + item.key == 'sewage' && bus.emit(wsRouteToMapByName.key); }; const events_params = { setHighlight: { key: "setHighlight" }, setLayerVisible: { key: "setLayerVisible" }, clearTemporaryData: { key: "clearTemporaryData" }, + wsRouteToMapByName: { key: "wsRouteToMapByName" }, }; const closeAllLayer = () => { const { setLayerVisible, setHighlight } = events_params; - AllData.yw_type - .map((i) => i.values) - .filter(Boolean) - .flat() - .forEach((i) => - bus.emit(setLayerVisible.key, { - layername: i.key, - isCheck: false, - values: i.values, - }) - ); + AllData.yw_type.map((i) => i.values).filter(Boolean).flat().forEach((i) => bus.emit(setLayerVisible.key, {layername: i.key, isCheck: false, values: i.values,})); bus.emit(setHighlight.key, []); }; diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue index 1a68d0c..e4ca055 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue @@ -775,6 +775,7 @@ } } // 赋值需要进行echarts数据请求的数据 + // debugger; AllData.regionGrade = res.data.length == 1 ? "two" @@ -823,7 +824,7 @@ */ const GetData = (queryType) => { if (AllData.regionGrade == "five") return; - if (AllData.regionGrade == "four" && AllData.TypeID == "rain") return; + // if (AllData.regionGrade == "four" && AllData.TypeID == "rain") return; let params = { regionGrade: AllData.regionGrade, regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水） diff --git a/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue b/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue index 121289b..ab220d9 100644 --- a/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue +++ b/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue @@ -166,35 +166,35 @@ label: '龙王嘴污水处理厂', value: '龙王嘴污水处理厂', values: '龙王嘴污水处理厂', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/1fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/1fenqu/tileset.json', easeTo: {"zoom": 16.59407171571377, "center": [114.3705429075477, 30.492439863093296], "pitch": 64.9999999999998, "bearing": 0}, }, { label: '洪山高级中学', value: '洪山高级中学', values: '洪山高级中学', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/2fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/2fenqu/tileset.json', easeTo: {"zoom": 17.81287927129665, "center": [114.38089058306196, 30.49322975938621], "pitch": 73.1403666953906, "bearing": 29.79517258244755}, }, { label: '中南民族大学', value: '中南民族大学', values: '中南民族大学', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/3fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/3fenqu/tileset.json', easeTo: {"zoom": 17.233580151793813, "center": [114.38786465157301, 30.49109786555684], "pitch": 64.99999999999974, "bearing": -14.399999999999864}, }, { label: '武汉纺织大学南湖校区', value: '武汉纺织大学南湖校区', values: '武汉纺织大学南湖校区', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/4fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/4fenqu/tileset.json', easeTo: {"zoom": 18.116267047007025, "center": [114.3927768535928, 30.48824237671211], "pitch": 71.44305293120455, "bearing": 37.51014089090722}, }, { label: '中建大公馆', value: '中建大公馆', values: '中建大公馆', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/5fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/5fenqu/tileset.json', // url: 'http://localhost:9992/1214/3dtile-x/5fenqu/tileset.json', easeTo: {"zoom": 17.251138347641298, "center": [114.4020023147911, 30.484443483567972], "pitch": 66.99999999999989, "bearing": -25.600000000000136}, }, @@ -203,7 +203,7 @@ value: '保利国际中心', values: '保利国际中心', // url: 'http://localhost:9992/1214/3dtile-x/6fenqu/tileset.json', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/6fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/6fenqu/tileset.json', easeTo: {"zoom": 17.687188362054506, "center": [114.40307345195083, 30.493463072026188], "pitch": 71.99999999999976, "bearing": -38.39999999999998}, }, { @@ -211,7 +211,7 @@ value: '北辰光谷里', values: '北辰光谷里', // url: 'http://localhost:9992/1214/3dtile-x/7fenqu/tileset.json', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/7fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/7fenqu/tileset.json', easeTo: {"zoom": 17.06523812182194, "center": [114.41040402249132, 30.484048091956765], "pitch": 59.4999999999999, "bearing": -37.36697917780225}, }, { @@ -219,7 +219,7 @@ value: 'K11Select', values: 'K11Select', // url: 'http://localhost:9992/1214/3dtile-x/8fenqu/tileset.json', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/8fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/8fenqu/tileset.json', easeTo: {"zoom": 16.779971941533105, "center": [114.40929977258014, 30.492555333756428], "pitch": 65.17673025474492, "bearing": 50.399999999999864}, } ]); diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json index bdf6856..770f52a 100644 --- a/public/static/libs/mapbox/night-style1.json +++ b/public/static/libs/mapbox/night-style1.json @@ -18,30 +18,30 @@ "version": "1.0.0", "scheme": "xyz", "tiles": [ - "https://supermap0.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap1.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap3.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap2.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap4.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap5.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap6.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap7.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap8.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap9.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap10.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap11.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap12.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap13.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap14.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf", - "https://supermap15.wh-nf.cn:8090/bm/tile/{z}/{x}/{y}.pbf" + "https://dhgx0.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx1.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx3.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx2.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx4.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx5.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx6.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx7.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx8.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx9.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx10.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx11.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx12.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx13.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx14.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf", + "https://dhgx15.wh-nf.cn:7081/bm/tile/{z}/{x}/{y}.pbf" ], "minzoom": 0, "maxzoom": 14 } }, - "sprite": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/sprite", - "glyphs": "https://supermap2.wh-nf.cn:8090/bm/static/map/style/fonts/{fontstack}/{range}.pbf", + "sprite": "https://dhgx12.wh-nf.cn:7081/bm/static/map/style/sprite", + "glyphs": "https://dhgx10.wh-nf.cn:7081/bm/static/map/style/fonts/{fontstack}/{range}.pbf", "layers": [ { "id": "background", diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json index ed18e3d..45e161c 100644 --- a/public/static/libs/mapbox/style/wh_dhgx.json +++ b/public/static/libs/mapbox/style/wh_dhgx.json @@ -1,25 +1,25 @@ { "params": { - "basemap": "https://supermap2.wh-nf.cn:8090/bm", + "basemap": "https://dhgx19.wh-nf.cn:7081/bm", "mvt": [ - "https://supermap0.wh-nf.cn:8090/vt/mvt", - "https://supermap1.wh-nf.cn:8090/vt/mvt", - "https://supermap2.wh-nf.cn:8090/vt/mvt", - "https://supermap3.wh-nf.cn:8090/vt/mvt", - "https://supermap4.wh-nf.cn:8090/vt/mvt", - "https://supermap5.wh-nf.cn:8090/vt/mvt", - "https://supermap6.wh-nf.cn:8090/vt/mvt", - "https://supermap7.wh-nf.cn:8090/vt/mvt", - "https://supermap8.wh-nf.cn:8090/vt/mvt", - "https://supermap9.wh-nf.cn:8090/vt/mvt", - "https://supermap10.wh-nf.cn:8090/vt/mvt", - "https://supermap11.wh-nf.cn:8090/vt/mvt", - "https://supermap12.wh-nf.cn:8090/vt/mvt", - "https://supermap13.wh-nf.cn:8090/vt/mvt", - "https://supermap14.wh-nf.cn:8090/vt/mvt", - "https://supermap15.wh-nf.cn:8090/vt/mvt" + "https://dhgx0.wh-nf.cn:7081/vt/mvt", + "https://dhgx1.wh-nf.cn:7081/vt/mvt", + "https://dhgx2.wh-nf.cn:7081/vt/mvt", + "https://dhgx3.wh-nf.cn:7081/vt/mvt", + "https://dhgx4.wh-nf.cn:7081/vt/mvt", + "https://dhgx5.wh-nf.cn:7081/vt/mvt", + "https://dhgx6.wh-nf.cn:7081/vt/mvt", + "https://dhgx7.wh-nf.cn:7081/vt/mvt", + "https://dhgx8.wh-nf.cn:7081/vt/mvt", + "https://dhgx9.wh-nf.cn:7081/vt/mvt", + "https://dhgx10.wh-nf.cn:7081/vt/mvt", + "https://dhgx11.wh-nf.cn:7081/vt/mvt", + "https://dhgx12.wh-nf.cn:7081/vt/mvt", + "https://dhgx13.wh-nf.cn:7081/vt/mvt", + "https://dhgx14.wh-nf.cn:7081/vt/mvt", + "https://dhgx15.wh-nf.cn:7081/vt/mvt" ], - "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson", + "geojson": "https://dhgx9.wh-nf.cn:7081/vt/geojson", "sprites": [ "/static/libs/mapbox/style/sprite/sprite" ], diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 2a6d65b..f94a395 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -534,9 +534,12 @@ }; const refreshGeoJSON = () => { - Object.keys(geojson).forEach( - (key) => map.getSource(key) && map.getSource(key).setData(geojson[key]) - ); + const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches); + Object.keys(geojson).forEach((key) => { + map.getSource(key) && map.getSource(key).setData(geojson[key]); + cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles()); + console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key))); + }); map.triggerRepaint(); }; diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 5b05425..1df1977 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -351,19 +351,19 @@ ({ 1: () => { !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init); - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 2: () => { - [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][ + [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][ Number(isYS) ](); }, 3: () => { [ () => { - wsRouteToMapByName(properties); + wsRouteToMapByName([properties]); }, () => { const _keys_ = [ @@ -427,85 +427,7 @@ psfq.prevIds.push(properties); } - function wsRouteToMapByName(properties) { - const _keys_ = [ - "污水系统流向1", - "污水系统流向", - "1_泵站", - "1_污水处理厂", - "sewage_pipeline_quality1", - "sewage_pump_station_info1", - "storage_tank_info1", - ]; - _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); - busEmit(removeMapDatas.key, _keys_); - let features = _.cloneDeep( - ws_routeGeoJSON.features.filter((i) => - i.properties.bind.split(",").includes(properties.name) - ) - ); - let geojson = turf.featureCollection( - features.map((i) => - Object.assign(i, { - properties: { - ...i.properties, - name: i.properties.name, - type: i.properties._type || "污水系统流向1", - color: "rgb(255,74,25)", - width: [0, 7, 5, 3][properties.level], - }, - }) - ) - ); - newfiberMap - .getLayers() - .filter((i) => i.newfiberId == _keys_[1])[0] - .setData(geojson); - busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); - let [features_point, features_point1, features_point2] = [[], [], []]; - let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0]; - if (["2", "3"].includes(properties.level)) { - let kk = _.replace(_keys_[4], /\d+/g, ""); - features_point = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => i.properties.type.includes(kk)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - features_point1 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[5].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - } - features_point2 = _.cloneDeep( - newfiberMap.map - .getSource("point") - ._data.features.filter((i) => _keys_[6].includes(i.properties.type)) - .filter((o) => turf.booleanPointInPolygon(o, polygon)) - ); - let geojson1 = turf.featureCollection( - [ - ...features_point.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[4] }, - })), - ...features_point1.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[5] }, - })), - ...features_point2.map((i) => ({ - ...i, - properties: { ...i.properties, type: _keys_[6] }, - })), - ] - .flat() - .filter(Boolean) - ); - busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); - } function showOutletInfo(properties) { const key = "outlet_info"; @@ -647,6 +569,36 @@ } }; +function wsRouteToMapByName(properties) { + const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params; + const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"]; + _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true })); + busEmit(removeMapDatas.key, _keys_); + if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties); + let geojson = turf.featureCollection([]); + properties.forEach(p => { + let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name))); + geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},}))); + busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] }); + }) + newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson); + if(properties.length != 1) return; + let [features_point, features_point1, features_point2] = [[], [], []]; + let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0]; + if (["2", "3"].includes(properties[0].level)) { + let kk = _.replace(_keys_[4], /\d+/g, ""); + features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + } + features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon))); + let geojson1 = turf.featureCollection([ + ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})), + ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})), + ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },})) + ].flat().filter(Boolean) + ); + busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] }); +} function clearRouteMethod() { const { removeMapDatas } = events_params; const _keys = [ @@ -1172,6 +1124,7 @@ trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap }, clearTrajectory: { key: "clearTrajectory", method: clearTrajectory }, clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData }, + wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName }, load3DTiles: { key: "load3DTiles", method: load3DTiles }, remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles }, isOpenPanorama: { diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 3dfbd82..7e225da 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -131,9 +131,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : ''; } else { return; } @@ -186,10 +184,7 @@ dialogConfig.visible = true; dialogConfig.dataCode = type; dialogConfig.dataID = Getproperties.value.stCode; - dialogConfig.comIDs = GetcomIDs.value; - dialogConfig.title = Getproperties.value.name.split('\n')[0]; - dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : ''; } else { return; } @@ -260,8 +255,9 @@ } // debugger; let params = { - dataCode: specificFun(type) || type, - scene: 'basis_monitor', + dataCode: type, + scene: specificFun(type) || 'basis_monitor', + // scene: "basis_monitor", dataId: dataId, }; drainageDispatchGetMenu(params).then(res => { @@ -372,6 +368,7 @@ console.log('经纬度', lngLat); console.log('数据', properties); console.log('layerid', layerId); + dialogConfig.title = properties.stName || properties.name; // 处理标注 Getproperties.value = properties; @@ -474,6 +471,7 @@ dialogConfig.visible = is; }; function anotherMeht(item) { + debugger; let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 97f0cf3..9ecae08 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -14,22 +14,22 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '排水户统计' - : AllData.regionGrade == 'two' - ? '排水户统计' - : AllData.regionGrade == 'three' - ? '排水户统计' - : AllData.regionGrade == 'four' - ? '水量统计' - : '' + AllData.regionGrade == "one" + ? "排水户统计" + : AllData.regionGrade == "two" + ? "排水户统计" + : AllData.regionGrade == "three" + ? "排水户统计" + : AllData.regionGrade == "four" + ? "水量统计" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
@@ -50,15 +50,15 @@
{{ - AllData.regionGrade == 'one' - ? '管网统计' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '排水类别' - : AllData.regionGrade == 'four' - ? '排水类别' - : '' + AllData.regionGrade == "one" + ? "管网统计" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "排水类别" + : AllData.regionGrade == "four" + ? "排水类别" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -79,15 +79,15 @@
{{ - AllData.regionGrade == 'one' - ? '日污水水量' - : AllData.regionGrade == 'two' - ? '日污水水量' - : AllData.regionGrade == 'three' - ? '日水量统计' - : AllData.regionGrade == 'four' - ? '管网统计' - : '' + AllData.regionGrade == "one" + ? "日污水水量" + : AllData.regionGrade == "two" + ? "日污水水量" + : AllData.regionGrade == "three" + ? "日水量统计" + : AllData.regionGrade == "four" + ? "管网统计" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -110,11 +110,17 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -138,7 +147,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -153,62 +165,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -219,15 +237,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -235,71 +263,71 @@ @@ -1075,7 +1148,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1100,6 +1173,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1136,7 +1210,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 62c4098..6ada224 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -14,28 +14,32 @@ v-show="item.abbreviation" @click="MBClick(item)" > - {{ item.grade != 'one' ? '/' : '' }} - {{ item.abbreviation ? item.abbreviation : '' }} + {{ item.grade != "one" ? "/" : "" }} + {{ item.abbreviation ? item.abbreviation : "" }}
{{ - AllData.regionGrade == 'one' - ? '河湖水情' - : AllData.regionGrade == 'two' - ? '管网监测' - : AllData.regionGrade == 'three' - ? '管网统计' - : AllData.regionGrade == 'four' - ? '当日水量分析' - : '' + AllData.regionGrade == "one" + ? "河湖水情" + : AllData.regionGrade == "two" + ? "管网监测" + : AllData.regionGrade == "three" + ? "管网统计" + : AllData.regionGrade == "four" + ? "当日水量分析" + : "" }} {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '流域管网' - : AllData.regionGrade == 'two' - ? '管网统计' - : AllData.regionGrade == 'three' - ? '当日水量分析' - : AllData.regionGrade == 'four' - ? '渍水风险点' - : '' + AllData.regionGrade == "one" + ? "流域管网" + : AllData.regionGrade == "two" + ? "管网统计" + : AllData.regionGrade == "three" + ? "当日水量分析" + : AllData.regionGrade == "four" + ? "渍水风险点" + : "" }} {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
{{ - AllData.regionGrade == 'one' - ? '河湖排口' - : AllData.regionGrade == 'two' - ? '湖泊排口' - : AllData.regionGrade == 'three' - ? '渍水风险点' - : AllData.regionGrade == 'four' - ? '历史风险' - : '' + AllData.regionGrade == "one" + ? "河湖排口" + : AllData.regionGrade == "two" + ? "湖泊排口" + : AllData.regionGrade == "three" + ? "渍水风险点" + : AllData.regionGrade == "four" + ? "历史风险" + : "" }} {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- + {{ AllData.SLFX.upstreamSiteWaterYield }} 万吨 @@ -142,7 +163,10 @@
- + {{ AllData.SLFX.siteWaterYield }} 万吨 @@ -151,8 +175,13 @@
- - {{ AllData.SLFX.downstreamSiteWaterYield }} + + {{ + AllData.SLFX.downstreamSiteWaterYield + }} 万吨
@@ -166,62 +195,68 @@
类型:
- {{ AllData.GWBD.pointType == 'YS' ? '雨水管网' : AllData.GWBD.pointType == 'WS' ? '污水管网' : '--' }} + {{ + AllData.GWBD.pointType == "YS" + ? "雨水管网" + : AllData.GWBD.pointType == "WS" + ? "污水管网" + : "--" + }}
设计编号:
- {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : '--' }} + {{ AllData.GWBD.stAsName ? AllData.GWBD.stAsName : "--" }}
管井编码:
- {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : '--' }} + {{ AllData.GWBD.pointNumber ? AllData.GWBD.pointNumber : "--" }}
站点编号:
- {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : '--' }} + {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
年份:
- {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : '--' }} + {{ AllData.GWBD.buildTime ? AllData.GWBD.buildTime : "--" }}
管径:
- {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : '--' }} + {{ AllData.GWBD.pipelineDiameter ? AllData.GWBD.pipelineDiameter : "--" }}
材质:
- {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : '--' }} + {{ AllData.GWBD.pipelineTexture ? AllData.GWBD.pipelineTexture : "--" }}
缺陷类型:
- {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : '--' }} + {{ AllData.GWBD.issueType ? AllData.GWBD.issueType : "--" }}
标段片区:
- {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : '--' }} + {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
末次运维:
- {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : '--' }} + {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
@@ -232,15 +267,25 @@
港渠统计 水质统计
- - + +
@@ -248,15 +293,25 @@
- {{ AllData.ClicksiteName }} + {{ + AllData.ClicksiteName + }}
- +
@@ -264,75 +319,75 @@ @@ -1183,7 +1286,7 @@ .CrumbesTitle { width: 100%; height: 44px; - background: url('@/assets/images/pictureOnMap/eachBgc.png') no-repeat center; + background: url("@/assets/images/pictureOnMap/eachBgc.png") no-repeat center; background-size: 100% 100%; box-sizing: border-box; padding-left: 40px; @@ -1208,6 +1311,7 @@ overflow: hidden; text-overflow: ellipsis; /* 超出宽度200px后显示省略号 */ white-space: nowrap; /* 限制不允许换行 */ + cursor: pointer; } } .modular1, @@ -1244,7 +1348,7 @@ height: 110px; box-sizing: border-box; padding: 15px 0; - background-image: url('@/assets/images/pictureOnMap/SLFX.png'); + background-image: url("@/assets/images/pictureOnMap/SLFX.png"); background-repeat: no-repeat; background-size: contain; .SlList1P { diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue index aa58be6..fea3dc3 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue @@ -2,7 +2,7 @@
-
历史水质
+
历史水质
{ + const { setLayerVisible, clearTemporaryData,wsRouteToMapByName } = events_params; closeAllLayer(); - bus.emit("clearTemporaryData"); - const { setLayerVisible } = events_params; + bus.emit(clearTemporaryData.key); newfiberMap.map.easeTo(newfiberMap.config_.params.init); - item.values && - item.values - .filter((i) => i.visible) - .forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); + item.values && item.values.filter((i) => i.visible).forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true })); + item.key == 'sewage' && bus.emit(wsRouteToMapByName.key); }; const events_params = { setHighlight: { key: "setHighlight" }, setLayerVisible: { key: "setLayerVisible" }, clearTemporaryData: { key: "clearTemporaryData" }, + wsRouteToMapByName: { key: "wsRouteToMapByName" }, }; const closeAllLayer = () => { const { setLayerVisible, setHighlight } = events_params; - AllData.yw_type - .map((i) => i.values) - .filter(Boolean) - .flat() - .forEach((i) => - bus.emit(setLayerVisible.key, { - layername: i.key, - isCheck: false, - values: i.values, - }) - ); + AllData.yw_type.map((i) => i.values).filter(Boolean).flat().forEach((i) => bus.emit(setLayerVisible.key, {layername: i.key, isCheck: false, values: i.values,})); bus.emit(setHighlight.key, []); }; diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue index 1a68d0c..e4ca055 100644 --- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue +++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue @@ -775,6 +775,7 @@ } } // 赋值需要进行echarts数据请求的数据 + // debugger; AllData.regionGrade = res.data.length == 1 ? "two" @@ -823,7 +824,7 @@ */ const GetData = (queryType) => { if (AllData.regionGrade == "five") return; - if (AllData.regionGrade == "four" && AllData.TypeID == "rain") return; + // if (AllData.regionGrade == "four" && AllData.TypeID == "rain") return; let params = { regionGrade: AllData.regionGrade, regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水） diff --git a/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue b/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue index 121289b..ab220d9 100644 --- a/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue +++ b/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue @@ -166,35 +166,35 @@ label: '龙王嘴污水处理厂', value: '龙王嘴污水处理厂', values: '龙王嘴污水处理厂', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/1fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/1fenqu/tileset.json', easeTo: {"zoom": 16.59407171571377, "center": [114.3705429075477, 30.492439863093296], "pitch": 64.9999999999998, "bearing": 0}, }, { label: '洪山高级中学', value: '洪山高级中学', values: '洪山高级中学', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/2fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/2fenqu/tileset.json', easeTo: {"zoom": 17.81287927129665, "center": [114.38089058306196, 30.49322975938621], "pitch": 73.1403666953906, "bearing": 29.79517258244755}, }, { label: '中南民族大学', value: '中南民族大学', values: '中南民族大学', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/3fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/3fenqu/tileset.json', easeTo: {"zoom": 17.233580151793813, "center": [114.38786465157301, 30.49109786555684], "pitch": 64.99999999999974, "bearing": -14.399999999999864}, }, { label: '武汉纺织大学南湖校区', value: '武汉纺织大学南湖校区', values: '武汉纺织大学南湖校区', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/4fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/4fenqu/tileset.json', easeTo: {"zoom": 18.116267047007025, "center": [114.3927768535928, 30.48824237671211], "pitch": 71.44305293120455, "bearing": 37.51014089090722}, }, { label: '中建大公馆', value: '中建大公馆', values: '中建大公馆', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/5fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/5fenqu/tileset.json', // url: 'http://localhost:9992/1214/3dtile-x/5fenqu/tileset.json', easeTo: {"zoom": 17.251138347641298, "center": [114.4020023147911, 30.484443483567972], "pitch": 66.99999999999989, "bearing": -25.600000000000136}, }, @@ -203,7 +203,7 @@ value: '保利国际中心', values: '保利国际中心', // url: 'http://localhost:9992/1214/3dtile-x/6fenqu/tileset.json', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/6fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/6fenqu/tileset.json', easeTo: {"zoom": 17.687188362054506, "center": [114.40307345195083, 30.493463072026188], "pitch": 71.99999999999976, "bearing": -38.39999999999998}, }, { @@ -211,7 +211,7 @@ value: '北辰光谷里', values: '北辰光谷里', // url: 'http://localhost:9992/1214/3dtile-x/7fenqu/tileset.json', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/7fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/7fenqu/tileset.json', easeTo: {"zoom": 17.06523812182194, "center": [114.41040402249132, 30.484048091956765], "pitch": 59.4999999999999, "bearing": -37.36697917780225}, }, { @@ -219,7 +219,7 @@ value: 'K11Select', values: 'K11Select', // url: 'http://localhost:9992/1214/3dtile-x/8fenqu/tileset.json', - url: 'https://supermap10.wh-nf.cn:8090/resource/3dtiles/gxq/batch_1/8fenqu/tileset.json', + url: 'https://dhgx10.wh-nf.cn:7081/resource/3dtiles/gxq/batch_1/8fenqu/tileset.json', easeTo: {"zoom": 16.779971941533105, "center": [114.40929977258014, 30.492555333756428], "pitch": 65.17673025474492, "bearing": 50.399999999999864}, } ]); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue b/src/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue index e768703..e96a4e7 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue @@ -81,12 +81,15 @@ type: Array, }, }); + // 声明本页面中的变量 const AllData = reactive({ editableTabsValue: "", editableTabs: [], RefreshName: "", }); + + const updateTabsType = (name) => { AllData.editableTabsValue = name; AllData.RefreshName = name;