diff --git a/super-screen/client/src/sections/water-prevention/components/charts/ring.js b/super-screen/client/src/sections/water-prevention/components/charts/ring.js index 34205a2..a10284e 100644 --- a/super-screen/client/src/sections/water-prevention/components/charts/ring.js +++ b/super-screen/client/src/sections/water-prevention/components/charts/ring.js @@ -93,13 +93,14 @@ function RingChart(props) { const { height, width } = props; const options = getOption(); const percent_colors = ['#24DDFA', '#267FD3', '#F8C86B',] + const total = data?.reduce((p, c) => p + c.value, 0) const renderList = () => data.map((s, index) => (
{s.name}
-
{s.value}个 14%
+
{s.value}个 {Math.round(s.value / total * 100)}%
)); diff --git a/super-screen/client/src/sections/water-prevention/components/left-bottom.js b/super-screen/client/src/sections/water-prevention/components/left-bottom.js index 4f6561c..b236c20 100644 --- a/super-screen/client/src/sections/water-prevention/components/left-bottom.js +++ b/super-screen/client/src/sections/water-prevention/components/left-bottom.js @@ -33,9 +33,9 @@ function LeftBottom(props) { ]; const data = [ - { name: '泵站站点', value: SHUI_ZHAN.length }, + { name: '泵站站点', value: 12 }, { name: '雨量站点', value: 1 }, - { name: '水位站点', value: waterLevelLength } + { name: '水位站点', value: 23 } ] return 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 5d9c938..82de562 100644 --- a/super-screen/client/src/sections/water-prevention/containers/gis.js +++ b/super-screen/client/src/sections/water-prevention/containers/gis.js @@ -135,10 +135,12 @@ function Map(props) { setTimeout(() => { if (document.getElementById(`contentid${x.name}`)) { render(
-
{ - map.setCenter([115.922069, 28.554867]) - map.clearInfoWindow(); - }} /> +
{ + map.setCenter([115.922069, 28.554867]) + map.clearInfoWindow(); + }} />
泵站名称: {x.name}