diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json index 0267ba0..ce6ddba 100644 --- a/public/static/libs/mapbox/style/preventionCX.json +++ b/public/static/libs/mapbox/style/preventionCX.json @@ -3,14 +3,14 @@ "basemap": "https://supermap2.wh-nf.cn:8090/bm", "mvt": "https://supermap0.wh-nf.cn:8090/vt", "sprites": [ - "/static/libs/mapbox/style/sprite/sprite4" + "/static/libs/mapbox/style/sprite/sprite5" ], "init": { "center": [ 114.312, 34.802 ], - "zoom": 12.15, + "zoom": 11, "style": "/static/libs/mapbox/style/customs/night-style.json" }, "l7": { @@ -68,6 +68,72 @@ ] } ], + "mapbox": [ + { + "id": "point", + "key": "point", + "type": "symbol", + "minzoom": 0, + "maxzoom": 24, + "filter": [ + "in", + "type", + "" + ], + "paint": { + "text-color": "rgba(255, 255, 255, 1)", + "text-halo-color": "rgba(14, 139, 90, 1)", + "text-halo-width": 2 + }, + "layout": { + "icon-image": [ + "match", + [ + "get", + "type" + ], + "YSBZ", + "rainBengZhan_icon", + "WSBZ", + "sewageBenZhan_icon", + "combineBengZhan", + "combineBengZhan_icon", + "sewageFactory", + "sewageFactory_icon", + "waterLoging", + "waterLoging_icon", + "waterCourse", + "waterCourse_icon", + "rainStation", + "rainStation_icon", + "origine", + "origine_icon", + "spongeFacility", + "spongeFacility_icon", + "waterFactory", + "waterFactory_icon", + "ysbz" + ], + "text-allow-overlap": true, + "icon-allow-overlap": true, + "icon-anchor": "center", + "icon-size": 0.8, + "text-field": "{name}", + "text-font": [ + "KlokanTech Noto Sans Regular" + ], + "text-size": 16, + "text-line-height": 3, + "text-anchor": "bottom", + "text-max-width": 50, + "text-offset": [ + 0, + -0.8 + ] + }, + "mType": "geojson" + } + ], "orders": [ [ "poi_label" @@ -190,53 +256,5 @@ "pitch": 55 } } - }, - "mapbox": [ - { - "id": "point", - "key": "point", - "type": "symbol", - "minzoom": 0, - "maxzoom": 24, - "filter": [ - "in", - "type", - "" - ], - "paint": { - "text-color": "#ffffff" - }, - "layout": { - "icon-image": [ - "match", - [ - "get", - "type" - ], - "success_zishui", - "ysj", - "error_zishui", - "wsj", - "ysbz" - ], - "text-allow-overlap": false, - "icon-allow-overlap": false, - "icon-anchor": "center", - "icon-size": 0.8, - "text-field": "{name}", - "text-font": [ - "KlokanTech Noto Sans Regular" - ], - "text-size": 16, - "text-line-height": 3, - "text-anchor": "bottom", - "text-max-width": 50, - "text-offset": [ - 0, - -1 - ] - }, - "mType": "geojson" - } - ] + } } \ No newline at end of file diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json index 0267ba0..ce6ddba 100644 --- a/public/static/libs/mapbox/style/preventionCX.json +++ b/public/static/libs/mapbox/style/preventionCX.json @@ -3,14 +3,14 @@ "basemap": "https://supermap2.wh-nf.cn:8090/bm", "mvt": "https://supermap0.wh-nf.cn:8090/vt", "sprites": [ - "/static/libs/mapbox/style/sprite/sprite4" + "/static/libs/mapbox/style/sprite/sprite5" ], "init": { "center": [ 114.312, 34.802 ], - "zoom": 12.15, + "zoom": 11, "style": "/static/libs/mapbox/style/customs/night-style.json" }, "l7": { @@ -68,6 +68,72 @@ ] } ], + "mapbox": [ + { + "id": "point", + "key": "point", + "type": "symbol", + "minzoom": 0, + "maxzoom": 24, + "filter": [ + "in", + "type", + "" + ], + "paint": { + "text-color": "rgba(255, 255, 255, 1)", + "text-halo-color": "rgba(14, 139, 90, 1)", + "text-halo-width": 2 + }, + "layout": { + "icon-image": [ + "match", + [ + "get", + "type" + ], + "YSBZ", + "rainBengZhan_icon", + "WSBZ", + "sewageBenZhan_icon", + "combineBengZhan", + "combineBengZhan_icon", + "sewageFactory", + "sewageFactory_icon", + "waterLoging", + "waterLoging_icon", + "waterCourse", + "waterCourse_icon", + "rainStation", + "rainStation_icon", + "origine", + "origine_icon", + "spongeFacility", + "spongeFacility_icon", + "waterFactory", + "waterFactory_icon", + "ysbz" + ], + "text-allow-overlap": true, + "icon-allow-overlap": true, + "icon-anchor": "center", + "icon-size": 0.8, + "text-field": "{name}", + "text-font": [ + "KlokanTech Noto Sans Regular" + ], + "text-size": 16, + "text-line-height": 3, + "text-anchor": "bottom", + "text-max-width": 50, + "text-offset": [ + 0, + -0.8 + ] + }, + "mType": "geojson" + } + ], "orders": [ [ "poi_label" @@ -190,53 +256,5 @@ "pitch": 55 } } - }, - "mapbox": [ - { - "id": "point", - "key": "point", - "type": "symbol", - "minzoom": 0, - "maxzoom": 24, - "filter": [ - "in", - "type", - "" - ], - "paint": { - "text-color": "#ffffff" - }, - "layout": { - "icon-image": [ - "match", - [ - "get", - "type" - ], - "success_zishui", - "ysj", - "error_zishui", - "wsj", - "ysbz" - ], - "text-allow-overlap": false, - "icon-allow-overlap": false, - "icon-anchor": "center", - "icon-size": 0.8, - "text-field": "{name}", - "text-font": [ - "KlokanTech Noto Sans Regular" - ], - "text-size": 16, - "text-line-height": 3, - "text-anchor": "bottom", - "text-max-width": 50, - "text-offset": [ - 0, - -1 - ] - }, - "mType": "geojson" - } - ] + } } \ No newline at end of file diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index bd7829a..49a2d4e 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -71,8 +71,6 @@ }, }); newfiberMapbox.addControl(mouseLocation); - console.log('spritesspritessprites', sprites); - !!!map.getSource('kaifengWater') && map.addSource('kaifengWater', { type: 'geojson', data: kaifengWater }); !!!map.getLayer('kaifengWater') && map.addLayer({ @@ -83,7 +81,7 @@ 'fill-color': 'rgba(117, 207, 240,1)', }, }); - addRiverFlow(); + //addRiverFlow(); addWaterLabel(); //addAreaBoundary(); await loadData(); @@ -269,7 +267,6 @@ }; const setLegendData = list => { - console.log('list---', list); list.forEach(i => { console.log('iii---', i); i.data && diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json index 0267ba0..ce6ddba 100644 --- a/public/static/libs/mapbox/style/preventionCX.json +++ b/public/static/libs/mapbox/style/preventionCX.json @@ -3,14 +3,14 @@ "basemap": "https://supermap2.wh-nf.cn:8090/bm", "mvt": "https://supermap0.wh-nf.cn:8090/vt", "sprites": [ - "/static/libs/mapbox/style/sprite/sprite4" + "/static/libs/mapbox/style/sprite/sprite5" ], "init": { "center": [ 114.312, 34.802 ], - "zoom": 12.15, + "zoom": 11, "style": "/static/libs/mapbox/style/customs/night-style.json" }, "l7": { @@ -68,6 +68,72 @@ ] } ], + "mapbox": [ + { + "id": "point", + "key": "point", + "type": "symbol", + "minzoom": 0, + "maxzoom": 24, + "filter": [ + "in", + "type", + "" + ], + "paint": { + "text-color": "rgba(255, 255, 255, 1)", + "text-halo-color": "rgba(14, 139, 90, 1)", + "text-halo-width": 2 + }, + "layout": { + "icon-image": [ + "match", + [ + "get", + "type" + ], + "YSBZ", + "rainBengZhan_icon", + "WSBZ", + "sewageBenZhan_icon", + "combineBengZhan", + "combineBengZhan_icon", + "sewageFactory", + "sewageFactory_icon", + "waterLoging", + "waterLoging_icon", + "waterCourse", + "waterCourse_icon", + "rainStation", + "rainStation_icon", + "origine", + "origine_icon", + "spongeFacility", + "spongeFacility_icon", + "waterFactory", + "waterFactory_icon", + "ysbz" + ], + "text-allow-overlap": true, + "icon-allow-overlap": true, + "icon-anchor": "center", + "icon-size": 0.8, + "text-field": "{name}", + "text-font": [ + "KlokanTech Noto Sans Regular" + ], + "text-size": 16, + "text-line-height": 3, + "text-anchor": "bottom", + "text-max-width": 50, + "text-offset": [ + 0, + -0.8 + ] + }, + "mType": "geojson" + } + ], "orders": [ [ "poi_label" @@ -190,53 +256,5 @@ "pitch": 55 } } - }, - "mapbox": [ - { - "id": "point", - "key": "point", - "type": "symbol", - "minzoom": 0, - "maxzoom": 24, - "filter": [ - "in", - "type", - "" - ], - "paint": { - "text-color": "#ffffff" - }, - "layout": { - "icon-image": [ - "match", - [ - "get", - "type" - ], - "success_zishui", - "ysj", - "error_zishui", - "wsj", - "ysbz" - ], - "text-allow-overlap": false, - "icon-allow-overlap": false, - "icon-anchor": "center", - "icon-size": 0.8, - "text-field": "{name}", - "text-font": [ - "KlokanTech Noto Sans Regular" - ], - "text-size": 16, - "text-line-height": 3, - "text-anchor": "bottom", - "text-max-width": 50, - "text-offset": [ - 0, - -1 - ] - }, - "mType": "geojson" - } - ] + } } \ No newline at end of file diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index bd7829a..49a2d4e 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -71,8 +71,6 @@ }, }); newfiberMapbox.addControl(mouseLocation); - console.log('spritesspritessprites', sprites); - !!!map.getSource('kaifengWater') && map.addSource('kaifengWater', { type: 'geojson', data: kaifengWater }); !!!map.getLayer('kaifengWater') && map.addLayer({ @@ -83,7 +81,7 @@ 'fill-color': 'rgba(117, 207, 240,1)', }, }); - addRiverFlow(); + //addRiverFlow(); addWaterLabel(); //addAreaBoundary(); await loadData(); @@ -269,7 +267,6 @@ }; const setLegendData = list => { - console.log('list---', list); list.forEach(i => { console.log('iii---', i); i.data && diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 6a5ad20..ba23b0b 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -70,7 +70,7 @@ let params = {}; let projectStationRes = await queryProjectStation(params); if (projectStationRes && projectStationRes.code == 200) { - projectStation = this.getGeojsonData(projectStationRes.data); + projectStation = this.getGeojsonData(projectStationRes.data); //海绵设施 } //发送图例 legendDataList = this.legendData(); diff --git a/public/static/libs/mapbox/style/preventionCX.json b/public/static/libs/mapbox/style/preventionCX.json index 0267ba0..ce6ddba 100644 --- a/public/static/libs/mapbox/style/preventionCX.json +++ b/public/static/libs/mapbox/style/preventionCX.json @@ -3,14 +3,14 @@ "basemap": "https://supermap2.wh-nf.cn:8090/bm", "mvt": "https://supermap0.wh-nf.cn:8090/vt", "sprites": [ - "/static/libs/mapbox/style/sprite/sprite4" + "/static/libs/mapbox/style/sprite/sprite5" ], "init": { "center": [ 114.312, 34.802 ], - "zoom": 12.15, + "zoom": 11, "style": "/static/libs/mapbox/style/customs/night-style.json" }, "l7": { @@ -68,6 +68,72 @@ ] } ], + "mapbox": [ + { + "id": "point", + "key": "point", + "type": "symbol", + "minzoom": 0, + "maxzoom": 24, + "filter": [ + "in", + "type", + "" + ], + "paint": { + "text-color": "rgba(255, 255, 255, 1)", + "text-halo-color": "rgba(14, 139, 90, 1)", + "text-halo-width": 2 + }, + "layout": { + "icon-image": [ + "match", + [ + "get", + "type" + ], + "YSBZ", + "rainBengZhan_icon", + "WSBZ", + "sewageBenZhan_icon", + "combineBengZhan", + "combineBengZhan_icon", + "sewageFactory", + "sewageFactory_icon", + "waterLoging", + "waterLoging_icon", + "waterCourse", + "waterCourse_icon", + "rainStation", + "rainStation_icon", + "origine", + "origine_icon", + "spongeFacility", + "spongeFacility_icon", + "waterFactory", + "waterFactory_icon", + "ysbz" + ], + "text-allow-overlap": true, + "icon-allow-overlap": true, + "icon-anchor": "center", + "icon-size": 0.8, + "text-field": "{name}", + "text-font": [ + "KlokanTech Noto Sans Regular" + ], + "text-size": 16, + "text-line-height": 3, + "text-anchor": "bottom", + "text-max-width": 50, + "text-offset": [ + 0, + -0.8 + ] + }, + "mType": "geojson" + } + ], "orders": [ [ "poi_label" @@ -190,53 +256,5 @@ "pitch": 55 } } - }, - "mapbox": [ - { - "id": "point", - "key": "point", - "type": "symbol", - "minzoom": 0, - "maxzoom": 24, - "filter": [ - "in", - "type", - "" - ], - "paint": { - "text-color": "#ffffff" - }, - "layout": { - "icon-image": [ - "match", - [ - "get", - "type" - ], - "success_zishui", - "ysj", - "error_zishui", - "wsj", - "ysbz" - ], - "text-allow-overlap": false, - "icon-allow-overlap": false, - "icon-anchor": "center", - "icon-size": 0.8, - "text-field": "{name}", - "text-font": [ - "KlokanTech Noto Sans Regular" - ], - "text-size": 16, - "text-line-height": 3, - "text-anchor": "bottom", - "text-max-width": 50, - "text-offset": [ - 0, - -1 - ] - }, - "mType": "geojson" - } - ] + } } \ No newline at end of file diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index bd7829a..49a2d4e 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -71,8 +71,6 @@ }, }); newfiberMapbox.addControl(mouseLocation); - console.log('spritesspritessprites', sprites); - !!!map.getSource('kaifengWater') && map.addSource('kaifengWater', { type: 'geojson', data: kaifengWater }); !!!map.getLayer('kaifengWater') && map.addLayer({ @@ -83,7 +81,7 @@ 'fill-color': 'rgba(117, 207, 240,1)', }, }); - addRiverFlow(); + //addRiverFlow(); addWaterLabel(); //addAreaBoundary(); await loadData(); @@ -269,7 +267,6 @@ }; const setLegendData = list => { - console.log('list---', list); list.forEach(i => { console.log('iii---', i); i.data && diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 6a5ad20..ba23b0b 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -70,7 +70,7 @@ let params = {}; let projectStationRes = await queryProjectStation(params); if (projectStationRes && projectStationRes.code == 200) { - projectStation = this.getGeojsonData(projectStationRes.data); + projectStation = this.getGeojsonData(projectStationRes.data); //海绵设施 } //发送图例 legendDataList = this.legendData(); diff --git a/src/views/spongePerformance/OutputPerformance/AnnualTotalRunoff.vue b/src/views/spongePerformance/OutputPerformance/AnnualTotalRunoff.vue index 35608fb..3fb9851 100644 --- a/src/views/spongePerformance/OutputPerformance/AnnualTotalRunoff.vue +++ b/src/views/spongePerformance/OutputPerformance/AnnualTotalRunoff.vue @@ -2,7 +2,7 @@
- + @@ -22,10 +22,15 @@