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]}}
+ }> {{MM: '气象站',PP: '雨量站',RR: '水库水文站',ZZ: '河道水位站',ZQ:"河道水文站",QQ:'流量站'}?.[data?.sttp]}}
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 })}
>
-
+
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}]}
>
-
+
{
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 }) => {
<>
+
{
form.setFieldValue('ranger',null)
}}