From 28f545292dbed8e0d1a7cbee8cbd91dad28d068f Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Wed, 15 Oct 2025 16:52:55 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E4=BA=BA=E5=B7=A5=E7=9B=91=E6=B5=8B?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=9F=A5=E8=AF=A2=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/MapCtrl/Pops/DrpPop.js      |  2 +-
 src/views/gcaqjc/sjtjcx/sjlr/sy/form.js    |  9 ++++++++-
 src/views/gcaqjc/sjtjcx/sjlr/wy/form.js    |  9 ++++++++-
 src/views/gcaqjc/sjtjcx/sjlr/wy/toolbar.js | 12 ++++++------
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/views/Home/MapCtrl/Pops/DrpPop.js b/src/views/Home/MapCtrl/Pops/DrpPop.js
index 37154baa5..e71abcda0 100644
--- a/src/views/Home/MapCtrl/Pops/DrpPop.js
+++ b/src/views/Home/MapCtrl/Pops/DrpPop.js
@@ -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>
diff --git a/src/views/gcaqjc/sjtjcx/sjlr/sy/form.js b/src/views/gcaqjc/sjtjcx/sjlr/sy/form.js
index 2ac0b830d..9fc5e8747 100644
--- a/src/views/gcaqjc/sjtjcx/sjlr/sy/form.js
+++ b/src/views/gcaqjc/sjtjcx/sjlr/sy/form.js
@@ -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}>
diff --git a/src/views/gcaqjc/sjtjcx/sjlr/wy/form.js b/src/views/gcaqjc/sjtjcx/sjlr/wy/form.js
index 936c910d6..badc2f260 100644
--- a/src/views/gcaqjc/sjtjcx/sjlr/wy/form.js
+++ b/src/views/gcaqjc/sjtjcx/sjlr/wy/form.js
@@ -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="测点编号"
diff --git a/src/views/gcaqjc/sjtjcx/sjlr/wy/toolbar.js b/src/views/gcaqjc/sjtjcx/sjlr/wy/toolbar.js
index 7ec144fef..64e308d14 100644
--- a/src/views/gcaqjc/sjtjcx/sjlr/wy/toolbar.js
+++ b/src/views/gcaqjc/sjtjcx/sjlr/wy/toolbar.js
@@ -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)
               }}