fix():水资源调度分析bug修复
parent
bc353a29fc
commit
6f136fc17e
|
|
@ -9,6 +9,12 @@ import ReactEcharts from 'echarts-for-react';
|
||||||
import drpOption from './drpOption';
|
import drpOption from './drpOption';
|
||||||
const {RangePicker} = DatePicker;
|
const {RangePicker} = DatePicker;
|
||||||
export default function KrLine({ record }) {
|
export default function KrLine({ record }) {
|
||||||
|
const tm = [
|
||||||
|
moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }),
|
||||||
|
moment().add(1, 'hour').set({ minute: 0, second: 0 }),
|
||||||
|
];
|
||||||
|
const stm = moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm:ss");
|
||||||
|
const etm = moment().add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm:ss");
|
||||||
const columns = [
|
const columns = [
|
||||||
{title: '时间', key: '', dataIndex: '', align: 'center',render:(rec)=>moment(rec.tm).format('MM-DD HH:mm')},
|
{title: '时间', key: '', dataIndex: '', align: 'center',render:(rec)=>moment(rec.tm).format('MM-DD HH:mm')},
|
||||||
{
|
{
|
||||||
|
|
@ -44,12 +50,6 @@ export default function KrLine({ record }) {
|
||||||
setData(await reservoirmonitor(params));
|
setData(await reservoirmonitor(params));
|
||||||
}
|
}
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const stm = moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm:ss");
|
|
||||||
const etm = moment().add(1, 'hour').set({ minute: 0, second: 0 }).format("YYYY-MM-DD HH:mm:ss");
|
|
||||||
const tm = [
|
|
||||||
moment().subtract(7, 'days').add(1, 'hour').set({ minute: 0, second: 0 }),
|
|
||||||
moment().add(1, 'hour').set({ minute: 0, second: 0 }),
|
|
||||||
];
|
|
||||||
const params = {
|
const params = {
|
||||||
search: {
|
search: {
|
||||||
stm,
|
stm,
|
||||||
|
|
@ -71,7 +71,7 @@ export default function KrLine({ record }) {
|
||||||
value={params.tm}
|
value={params.tm}
|
||||||
/>
|
/>
|
||||||
<Button type="primary" onClick={doSearch} style={{marginLeft: "10px"}}>查询</Button>
|
<Button type="primary" onClick={doSearch} style={{marginLeft: "10px"}}>查询</Button>
|
||||||
<Button onClick={()=>setParams('')} style={{marginLeft: "10px"}}>重置</Button>
|
<Button onClick={()=>setParams({...params,tm,stm,etm})} style={{marginLeft: "10px"}}>重置</Button>
|
||||||
</div>
|
</div>
|
||||||
<div style={{width:"100%"}}>
|
<div style={{width:"100%"}}>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -169,17 +169,17 @@ export default function Gsnlfx() {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className='card-item'>
|
<div className='card-item'>
|
||||||
<div className='card-title'>
|
<div className='card-title' style={{marginBottom:30}}>
|
||||||
<img alt='' src={`${process.env.PUBLIC_URL}/assets/images/gsts.jpg`} />
|
<img alt='' src={`${process.env.PUBLIC_URL}/assets/images/gsts.jpg`} />
|
||||||
<span>计算可供水天数(天)</span>
|
<span>可供水天数(天)</span>
|
||||||
</div>
|
</div>
|
||||||
<div className='card-value'>
|
<div className='card-value'>
|
||||||
<span className='nl-value'>{gsDays?.value ?? "--"}</span>
|
<span className='nl-value'>{gsDays?.value ?? "--"}</span>
|
||||||
<span className='nl-time'>({gsDays?.tm ?? "--"})</span>
|
<span className='nl-time'>({gsDays?.tm ?? "--"})</span>
|
||||||
</div>
|
</div>
|
||||||
<div className='yc-content'>
|
{/* <div className='yc-content'>
|
||||||
<Button type='primary' style={{width:"30%",marginBottom:10,marginLeft:"40%"}}>计算</Button>
|
<Button type='primary' style={{width:"30%",marginBottom:10,marginLeft:"40%"}}>计算</Button>
|
||||||
</div>
|
</div> */}
|
||||||
</div>
|
</div>
|
||||||
<MyImg record={tableData[0] || {}}/>
|
<MyImg record={tableData[0] || {}}/>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.content-right{
|
.content-right{
|
||||||
flex: 1;
|
width: 850px;
|
||||||
border: 1px solid #dfdfdf;
|
border: 1px solid #dfdfdf;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue