diff --git a/src/assets/img/djz.jpg b/src/assets/img/djz.jpg new file mode 100644 index 000000000..54968becf Binary files /dev/null and b/src/assets/img/djz.jpg differ diff --git a/src/views/Home/MapCtrl/components/Sqjcsj/TableData.js b/src/views/Home/MapCtrl/components/Sqjcsj/TableData.js index 24a8f2460..1102f2d1e 100644 --- a/src/views/Home/MapCtrl/components/Sqjcsj/TableData.js +++ b/src/views/Home/MapCtrl/components/Sqjcsj/TableData.js @@ -6,10 +6,10 @@ import moment from 'moment' const Tabledata = ({data}) => { const columns = [ {title: '时间', key: '', dataIndex: '', align: 'center',render:(rec)=>moment(rec.tm).format('MM-DD HH:mm')}, - { - title: '雨量(mm)', key: 'drp', dataIndex: 'drp', align: 'center', - render: (rec) => {rec ?? "-"} - }, + // { + // title: '雨量(mm)', key: 'drp', dataIndex: 'drp', align: 'center', + // render: (rec) => {rec ?? "-"} + // }, { title: '水位(m)', key: 'z', dataIndex: 'z', align: 'center', render: (rec) => {rec ? rec.toFixed(2) : "-"} diff --git a/src/views/Home/MapCtrl/components/Sqjcsj/index.js b/src/views/Home/MapCtrl/components/Sqjcsj/index.js index 8e1752f7c..40edc8cd7 100644 --- a/src/views/Home/MapCtrl/components/Sqjcsj/index.js +++ b/src/views/Home/MapCtrl/components/Sqjcsj/index.js @@ -1,43 +1,43 @@ -import React, {useEffect, useMemo, useState,useRef} from 'react'; -import {Button, DatePicker, Form, Descriptions} from 'antd'; -import {normalizeSearchTmRange} from '../../../../../utils/tools'; +import React, { useEffect, useMemo, useState, useRef } from 'react'; +import { Button, DatePicker, Form, Descriptions } from 'antd'; +import { normalizeSearchTmRange } from '../../../../../utils/tools'; import ReactEcharts from 'echarts-for-react'; import moment from 'moment' import './index.less' import TableData from './TableData' import drpOption from './drpOption'; -import {monitor,getDetail} from '../../../../../service/sssq' +import { monitor, getDetail } from '../../../../../service/sssq' -const {RangePicker} = DatePicker; +const { RangePicker } = DatePicker; -function DrpSearch({record}) { +function DrpSearch({ record, update = false }) { const [data, setData] = useState([]); const [params, setParams] = useState({}) const [detail, setDetail] = useState({}); const rangePickerRef = useRef(); - const [initialDateRange , setInitialDateRange] = useState({}) + const [initialDateRange, setInitialDateRange] = useState({}) const option = useMemo(() => { if (data && data.length) { - return drpOption({data,wrz:record.wrz,grz:record.grz}); + return drpOption({ data, wrz: record.wrz, grz: record.grz }); } }, [data]) // 获取当前时间 const currentTime = moment(); // 设置早上八点的时间 - const eightAM = moment().set({hour: 8, minute: 0, second: 0, millisecond: 0}); + const eightAM = moment().set({ hour: 8, minute: 0, second: 0, millisecond: 0 }); const searchTm = (e) => { if (!e) { - setParams({...params, tm: "" }) + setParams({ ...params, tm: "" }) } else { setParams({ ...params, stm: e[0].format("YYYY-MM-DD HH:mm"), etm: e[1].format("YYYY-MM-DD HH:mm"), - tm:e, + tm: e, }) - + } }; const doSearch = () => { @@ -46,10 +46,10 @@ function DrpSearch({record}) { } const getData = async (params) => { setData(await monitor(params)); - setDetail(await getDetail({stcd:record.stcd,source:record.source,type:1})) + setDetail(await getDetail({ stcd: record.stcd, source: record.source, type: 1 })) } const handleReset = () => { - setParams({...params,tm:initialDateRange?.tm,stm:initialDateRange.stm,etm:initialDateRange.etm}) + setParams({ ...params, tm: initialDateRange?.tm, stm: initialDateRange.stm, etm: initialDateRange.etm }) }; useEffect(() => { @@ -57,8 +57,8 @@ function DrpSearch({record}) { option = { stcd: record.stcd, source: record.source, - etm: moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"), - stm: moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"), + etm: moment().add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm"), + stm: moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm"), tm: [ moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }), moment().add(1, 'hour').set({ minute: 0, second: 0 }), @@ -68,102 +68,116 @@ function DrpSearch({record}) { setParams(option) setInitialDateRange(option) getData(option) - + } }, [record]) return ( -
+
-
+
- - +
-
+
-
+
{ data.length > 0 ? :
- + style={{ width: "100%", height: '100%' }} + /> :
+
}
-
-
-
-
近1h雨量(mm)
-
{detail.h1||0}
+ {!update ? +
+
+
+
近1h雨量(mm)
+
{detail.h1 || 0}
+
+
+
近3h雨量(mm)
+
{detail.h3 || 0}
+
+
+
近6h雨量(mm)
+
{detail.h6 || 0}
+
+
+
近12h雨量(mm)
+
{detail.h12 || 0}
+
+
+
近24h雨量(mm)
+
{detail.h24 || 0}
+
+
+
本年降雨天数
+
{detail.yearDrpDay || 0}
+
+
+
24h水位变幅(m)
+
{detail.rzDiff > 0 ? "+" : ""}{detail.rzDiff ? detail.rzDiff.toFixed(2) : 0}
+
-
-
近3h雨量(mm)
-
{detail.h3||0}
-
-
-
近6h雨量(mm)
-
{detail.h6||0}
-
-
-
近12h雨量(mm)
-
{detail.h12||0}
-
-
-
近24h雨量(mm)
-
{detail.h24||0}
-
-
-
本年降雨天数
-
{detail.yearDrpDay||0}
-
-
-
24h水位变幅(m)
-
{detail.rzDiff > 0 ? "+" :"" }{detail.rzDiff?detail.rzDiff.toFixed(2) : 0}
+
+
+
近48h雨量(mm)
+
{detail.h48 || 0}
+
+
+
今日雨量(mm)
+
{detail.today || 0}
+
+
+
昨日雨量(mm)
+
{detail.yesterdayDrp || 0}
+
+
+
本月雨量(mm)
+
{detail.monthDrp || 0}
+
+
+
本年雨量(mm)
+
{detail.yearDrp || 0}
+
+
+
本年最大日雨量(mm)
+
{detail.maxDrp || 0}({moment(detail.maxDrpTime).format('MM-DD')})
+
+
+
本年最高水位(mm)
+
{detail.maxRz ? detail.maxRz.toFixed(2) : 0}
+
-
+ :
+
-
近48h雨量(mm)
-
{detail.h48||0}
-
-
-
今日雨量(mm)
-
{detail.today||0}
-
-
-
昨日雨量(mm)
-
{detail.yesterdayDrp||0}
-
-
-
本月雨量(mm)
-
{detail.monthDrp||0}
-
-
-
本年雨量(mm)
-
{detail.yearDrp||0}
-
-
-
本年最大日雨量(mm)
-
{detail.maxDrp||0}({moment(detail.maxDrpTime).format('MM-DD')})
-
-
-
本年最高水位(mm)
-
{detail.maxRz ? detail.maxRz.toFixed(2) :0}
+
24h水位变幅(m)
+
{detail.rzDiff > 0 ? "+" : ""}{detail.rzDiff ? detail.rzDiff.toFixed(2) : 0}
+
+
+
本年最高水位(mm)
+
{detail.maxRz ? detail.maxRz.toFixed(2) : 0}
+
-
+ }
) } diff --git a/src/views/gcaqjc/sjtjcx/sljc/toolbar.js b/src/views/gcaqjc/sjtjcx/sljc/toolbar.js index cd53ae95a..fc68ec5e1 100644 --- a/src/views/gcaqjc/sjtjcx/sljc/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/sljc/toolbar.js @@ -67,6 +67,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { setSearchVal({...values, dateTimeRangeSo:dateSo}); } + useEffect(() => { + let time = [moment().subtract(1,"weeks"),moment()] + let dateSo = { + start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), + end:moment(time[1]).format('YYYY-MM-DD 23:59:59'), + } + form.setFieldValue("tm",time) + setSearchVal({dateTimeRangeSo:dateSo}) + }, []) return ( diff --git a/src/views/gcaqjc/sjtjcx/syjc/toolbar.js b/src/views/gcaqjc/sjtjcx/syjc/toolbar.js index f41fedebd..5961f2336 100644 --- a/src/views/gcaqjc/sjtjcx/syjc/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/syjc/toolbar.js @@ -93,7 +93,16 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { getDmList() getStationCode() }, []) - + + useEffect(() => { + let time = [moment().subtract(1,"weeks"),moment()] + let dateSo = { + start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), + end:moment(time[1]).format('YYYY-MM-DD 23:59:59'), + } + form.setFieldValue("tm",time) + setSearchVal({dateTimeRangeSo:dateSo}) + }, []) return ( <> diff --git a/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js b/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js index 44eab2283..914813874 100644 --- a/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js @@ -83,7 +83,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { getStationCode() }, []) - + useEffect(() => { + let time = [moment().subtract(1,"weeks"),moment()] + let dateSo = { + start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), + end:moment(time[1]).format('YYYY-MM-DD 23:59:59'), + } + form.setFieldValue("tm",time) + setSearchVal({dateTimeRangeSo:dateSo}) + }, []) return ( <>
diff --git a/src/views/sq/qfg/zcdjxx.js b/src/views/sq/qfg/zcdjxx.js index 4d4c80d58..524d51f37 100644 --- a/src/views/sq/qfg/zcdjxx.js +++ b/src/views/sq/qfg/zcdjxx.js @@ -1,10 +1,10 @@ import { Image } from "antd" // import zd from '../../../assets/img/u0.png' -import zd from '../../../assets/img/wait.png' +import zd from '../../../assets/img/djz.jpg' const Page = () => { return (
- +
) } diff --git a/src/views/sq/qth/hdsq/index.js b/src/views/sq/qth/hdsq/index.js index 1bbf71f27..f6563c584 100644 --- a/src/views/sq/qth/hdsq/index.js +++ b/src/views/sq/qth/hdsq/index.js @@ -61,7 +61,7 @@ export default function Sksq() {
- +