From d002f8d2b2f1eebf3adcd68cc56c4fbc18380add Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Fri, 11 Aug 2023 11:31:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=8A=A1=E5=A4=A7=E5=B1=8F-=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E5=8F=8A=E6=B0=B4=E4=BD=8Dgis=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../water-prevention/components/style.less | 6 +++--- .../sections/water-prevention/containers/gis.js | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/super-screen/client/src/sections/water-prevention/components/style.less b/super-screen/client/src/sections/water-prevention/components/style.less index 84df1b1..aa76e67 100644 --- a/super-screen/client/src/sections/water-prevention/components/style.less +++ b/super-screen/client/src/sections/water-prevention/components/style.less @@ -369,9 +369,9 @@ justify-content: start; ._item { - width: 46%; - margin: 0.5% 2%; - height: 32%; + width: 98%; + margin: 4% 1%; + height: 90%; background: url('/assets/images/homepage/fire/videobg.png') no-repeat; background-size: 100% 100%; position: relative; diff --git a/super-screen/client/src/sections/water-prevention/containers/gis.js b/super-screen/client/src/sections/water-prevention/containers/gis.js index 1701e9e..365f18b 100644 --- a/super-screen/client/src/sections/water-prevention/containers/gis.js +++ b/super-screen/client/src/sections/water-prevention/containers/gis.js @@ -470,12 +470,12 @@ function Map(props) { // } height: function (index, feature) { const baseHeigh = 1200 - return feature.coordinates[0].properties.x.waterLevel > 30 ? baseHeigh * 6 : - feature.coordinates[0].properties.x.waterLevel > 25 ? baseHeigh * 5 : - feature.coordinates[0].properties.x.waterLevel > 20 ? baseHeigh * 4 : - feature.coordinates[0].properties.x.waterLevel > 15 ? baseHeigh * 3 : - feature.coordinates[0].properties.x.waterLevel > 10 ? baseHeigh * 2 : - feature.coordinates[0].properties.x.waterLevel > 0 ? baseHeigh * 1 : 0 + return feature.coordinates[0].properties.x.waterLevel > 30 ? baseHeigh * 14 : + feature.coordinates[0].properties.x.waterLevel > 25 ? baseHeigh * 13 : + feature.coordinates[0].properties.x.waterLevel > 20 ? baseHeigh * 12 : + feature.coordinates[0].properties.x.waterLevel > 15 ? baseHeigh * 11 : + feature.coordinates[0].properties.x.waterLevel > 10 ? baseHeigh * 10 : + feature.coordinates[0].properties.x.waterLevel > 0 ? baseHeigh * 9 : 0 }, topColor: function (index, feature) { @@ -505,7 +505,7 @@ function Map(props) { // visible: false, offset: [0, -s.waterLevel], style: { - 'padding': '5px 10px', + 'padding': '2px 4px', 'margin-bottom': '1rem', 'border-radius': '.25rem', 'background-color': '#143857', @@ -513,7 +513,7 @@ function Map(props) { 'border-width': 0, 'box-shadow': '0 2px 6px 0 rgba(255, 255, 255, .3)', 'text-align': 'center', - 'font-size': '16px', + 'font-size': '14px', 'color': '#DCF2FD', }, });