feat():人工监测录入查询更改

qzc-dev
李神峰 2025-10-15 16:52:55 +08:00
parent 8aae7170dc
commit 28f545292d
4 changed files with 23 additions and 9 deletions

View File

@ -71,7 +71,7 @@ function RealDrpTip({ id, data, dispatch }) {
border: "1px solid #74a7ff",
borderRadius: "5px"
}
}> {{MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站"}?.[data?.sttp]}</span>}
}> {{MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站",QQ:'流量站'}?.[data?.sttp]}</span>}
<div className="normalModalStyle_title_cancel">
<CloseOutlined onClick={closePop} style={{color:"#333"}}/>
</div>

View File

@ -139,7 +139,14 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
getValueFromEvent={(e, dateString) => dateString}
getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
>
<DatePicker disabled={mode === 'view'} format={'YYYY-MM-DD HH:mm:ss'} style={{ width: '100%' }} allowClear showTime />
<DatePicker
disabled={mode === 'view'}
format={'YYYY-MM-DD HH:mm:ss'}
style={{ width: '100%' }}
allowClear
showTime
placeholder='请选择时间'
/>
</Form.Item>
</Col>
<Col span={12}>

View File

@ -58,7 +58,14 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
rules={[{required: true}]}
>
<DatePicker disabled={mode==='view'} format={'YYYY-MM-DD HH:mm:ss'} style={{width:'100%'}} allowClear showTime />
<DatePicker
disabled={mode === 'view'}
format={'YYYY-MM-DD HH:mm:ss'}
style={{ width: '100%' }}
allowClear
showTime
placeholder='请选择时间'
/>
</Form.Item>
<Form.Item
label="测点编号"

View File

@ -84,8 +84,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role,exportFile }) => {
let dateSo;
if (values.tm) {
dateSo = {
start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
}
}
delete values.tm
@ -103,8 +103,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role,exportFile }) => {
form.setFieldValue('tm', [stm, etm])
setSearchVal({
dateTimeRangeSo: {
start: stm.format("YYYY-MM-DD HH:mm:ss"),
end: etm.format("YYYY-MM-DD HH:mm:ss")
start: stm.format("YYYY-MM-DD 00:00:00"),
end: etm.format("YYYY-MM-DD 23:59:59")
}
})
}, [])
@ -114,12 +114,12 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role,exportFile }) => {
<>
<div style={{display:'flex',justifyContent:'space-between'}}>
<Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish} onValuesChange={onValuesChange}>
<Form.Item label="监测时间" name="tm">
<Form.Item label="日期" name="tm">
<RangePicker
allowClear
showTime
style={{ width: "350px" }}
format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD"
onChange={(v)=>{
form.setFieldValue('ranger',null)
}}