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 ( -
+ style={{ width: "100%", height: '100%' }}
+ /> :