diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json index 2dae4ce..7b7f9f9 100644 --- a/public/static/libs/mapbox/style/lateWarn.json +++ b/public/static/libs/mapbox/style/lateWarn.json @@ -2,16 +2,11 @@ "params": { "basemap": "https://supermap2.wh-nf.cn:8090/bm", "mvt": "https://supermap0.wh-nf.cn:8090/vt", - "sprites": [ - "/static/libs/mapbox/style/sprite/sprite4" - ], + "sprites": ["/static/libs/mapbox/style/sprite/sprite4"], "init": { - "center": [ - 114.352, - 34.802 - ], - "zoom": 13.6, - "pitch": 55, + "center": [114.352, 34.802], + "zoom": 12.8, + "pitch": 35, "style": "/static/libs/mapbox/style/customs/night-style.json" } }, @@ -21,12 +16,7 @@ "type": "CanvasLayer", "params": { "id": "newfiber-CanvasLayer", - "bbox": [ - 113.76310326468648, - 30.82704073693232, - 114.13002700914065, - 31.01100745675831 - ], + "bbox": [113.76310326468648, 30.82704073693232, 114.13002700914065, 31.01100745675831], "width": 3000, "height": 1172, "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)" @@ -34,9 +24,7 @@ "methods": [ { "name": "addTo", - "params": [ - "''||map" - ] + "params": ["''||map"] }, { "name": "show", @@ -52,62 +40,26 @@ "type": "symbol", "minzoom": 0, "maxzoom": 24, - "filter": [ - "in", - "type", - "" - ], + "filter": ["in", "type", ""], "paint": { "text-color": "#ffffff" }, "layout": { - "icon-image": [ - "match", - [ - "get", - "type" - ], - "warning_monitor", - "warning_monitor", - "success_monitor", - "success_monitor", - "ysbz" - ], + "icon-image": ["match", ["get", "type"], "warning_monitor", "warning_monitor", "success_monitor", "success_monitor", "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-font": ["KlokanTech Noto Sans Regular"], "text-size": 16, "text-line-height": 3, "text-anchor": "bottom", "text-max-width": 50, - "text-offset": [ - 0, - -1 - ] + "text-offset": [0, -1] }, "mType": "geojson" } ], - "orders": [ - [ - "poi_label" - ], - [ - "place_label_city" - ], - [ - "road_major_label" - ], - [ - "place_label_other" - ], - [ - "point" - ] - ] -} \ No newline at end of file + "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]] +} diff --git a/public/static/libs/mapbox/style/lateWarn.json b/public/static/libs/mapbox/style/lateWarn.json index 2dae4ce..7b7f9f9 100644 --- a/public/static/libs/mapbox/style/lateWarn.json +++ b/public/static/libs/mapbox/style/lateWarn.json @@ -2,16 +2,11 @@ "params": { "basemap": "https://supermap2.wh-nf.cn:8090/bm", "mvt": "https://supermap0.wh-nf.cn:8090/vt", - "sprites": [ - "/static/libs/mapbox/style/sprite/sprite4" - ], + "sprites": ["/static/libs/mapbox/style/sprite/sprite4"], "init": { - "center": [ - 114.352, - 34.802 - ], - "zoom": 13.6, - "pitch": 55, + "center": [114.352, 34.802], + "zoom": 12.8, + "pitch": 35, "style": "/static/libs/mapbox/style/customs/night-style.json" } }, @@ -21,12 +16,7 @@ "type": "CanvasLayer", "params": { "id": "newfiber-CanvasLayer", - "bbox": [ - 113.76310326468648, - 30.82704073693232, - 114.13002700914065, - 31.01100745675831 - ], + "bbox": [113.76310326468648, 30.82704073693232, 114.13002700914065, 31.01100745675831], "width": 3000, "height": 1172, "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)" @@ -34,9 +24,7 @@ "methods": [ { "name": "addTo", - "params": [ - "''||map" - ] + "params": ["''||map"] }, { "name": "show", @@ -52,62 +40,26 @@ "type": "symbol", "minzoom": 0, "maxzoom": 24, - "filter": [ - "in", - "type", - "" - ], + "filter": ["in", "type", ""], "paint": { "text-color": "#ffffff" }, "layout": { - "icon-image": [ - "match", - [ - "get", - "type" - ], - "warning_monitor", - "warning_monitor", - "success_monitor", - "success_monitor", - "ysbz" - ], + "icon-image": ["match", ["get", "type"], "warning_monitor", "warning_monitor", "success_monitor", "success_monitor", "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-font": ["KlokanTech Noto Sans Regular"], "text-size": 16, "text-line-height": 3, "text-anchor": "bottom", "text-max-width": 50, - "text-offset": [ - 0, - -1 - ] + "text-offset": [0, -1] }, "mType": "geojson" } ], - "orders": [ - [ - "poi_label" - ], - [ - "place_label_city" - ], - [ - "road_major_label" - ], - [ - "place_label_other" - ], - [ - "point" - ] - ] -} \ No newline at end of file + "orders": [["poi_label"], ["place_label_city"], ["road_major_label"], ["place_label_other"], ["point"]] +} diff --git a/src/views/floodSys/floodYP/riskAssesRight.vue b/src/views/floodSys/floodYP/riskAssesRight.vue index e2c6593..4a053e5 100644 --- a/src/views/floodSys/floodYP/riskAssesRight.vue +++ b/src/views/floodSys/floodYP/riskAssesRight.vue @@ -3,8 +3,7 @@
模拟设计参数
-
-
+

设计降雨量: {{ props.paramsCase.rainfall }} mm @@ -169,7 +168,7 @@ box-shadow: 0 0 0 1px $mainColor2 inset !important; border-radius: 8px; padding: 10px; - margin-bottom: 30px; + margin-top: 20px; font-size: 15px; span {