diff --git a/super-screen/client/src/sections/water-prevention/components/right-top.js b/super-screen/client/src/sections/water-prevention/components/right-top.js index cd45611..e0da99e 100644 --- a/super-screen/client/src/sections/water-prevention/components/right-top.js +++ b/super-screen/client/src/sections/water-prevention/components/right-top.js @@ -1,6 +1,7 @@ import React, { useEffect, useState } from 'react' import { Box, AutoRollComponent } from '$components'; import { Tooltip } from 'antd'; +import moment from 'moment'; import './style.less'; function CitySafty(props) { @@ -12,7 +13,7 @@ function CitySafty(props) {
{s.name}
-
{s.currentTime}
+
{s.currentTime ? moment(s.currentTime).format('HH:mm:ss') : '--'}
{s.waterLevel}{s.waterLevel &&
0 ? '_upicon' : '_downicon'} />}
@@ -24,7 +25,16 @@ function CitySafty(props) {
} - return + const renderDate = () => { + let renderTime = '' + const time = trendData?.find(t => t.currentTime)?.currentTime + if (time) { + renderTime = moment(time).format('YYYY-MM-DD') + } + return
{renderTime}
+ } + + return
点位名称
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 4de9582..4bb9931 100644 --- a/super-screen/client/src/sections/water-prevention/components/style.less +++ b/super-screen/client/src/sections/water-prevention/components/style.less @@ -407,22 +407,22 @@ ._rank_item1 { text-align: center; - width: 25%; + width: 35%; } ._rank_item2 { text-align: center; - width: 20%; + width: 15%; } ._rank_item3 { - text-align: right; - width: 25%; + text-align: center; + width: 20%; } ._rank_item4 { text-align: center; - width: 35%; + width: 30%; } } @@ -445,7 +445,7 @@ ._rank_item1 { text-align: center; - width: 20%; + width: 35%; margin-left: 5px; white-space: nowrap; overflow: hidden; @@ -454,7 +454,7 @@ ._rank_item2 { // text-align: center; - width: 35%; + width: 20%; } ._rank_item3 {