From ccb029352b4707798ea5400c2963d968f92fc060 Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Mon, 15 Sep 2025 17:46:11 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E4=BA=BA=E5=B7=A5=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8F=9C=E5=8D=95=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/models/auth/_.ts | 2 +- src/service/apiurl.js | 3 +- src/views/gcaqjc/sjtjcx/sjlr/sy/form.js | 34 ++++++++++++++++++---- src/views/gcaqjc/sjtjcx/sjlr/sy/index.js | 2 +- src/views/gcaqjc/sjtjcx/sjlr/sy/toolbar.js | 10 +++---- src/views/gcaqjc/sjtjcx/syjc/toolbar.js | 10 +++---- 6 files changed, 43 insertions(+), 18 deletions(-) diff --git a/src/models/auth/_.ts b/src/models/auth/_.ts index 33b8c5f99..bfc50f4cd 100644 --- a/src/models/auth/_.ts +++ b/src/models/auth/_.ts @@ -427,7 +427,7 @@ export async function loadMenu(): Promise { { id: id(), title: '渗压监测', path: '/mgr/gcaqjc/sjtjcx/syjx' }, { id: id(), title: '渗流监测 ', path: '/mgr/gcaqjc/sjtjcx/sljx' }, { id: id(), title: '位移监测 ', path: '/mgr/gcaqjc/sjtjcx/wyjx' }, - { id: id(), title: '人工监测数据录入 ', path: '/mgr/gcaqjc/sjtjcx/sjlr' }, + // { id: id(), title: '人工监测数据录入 ', path: '/mgr/gcaqjc/sjtjcx/sjlr' }, { id: id(), title: '年度渗压统计表', path: '/mgr/gcaqjc/sjtjcx/ndsytjb' }, { id: id(), title: '年度渗流统计表', path: '/mgr/gcaqjc/sjtjcx/ndsltjb' }, { id: id(), title: '年度位移统计表', path: '/mgr/gcaqjc/sjtjcx/ndwytjb' }, diff --git a/src/service/apiurl.js b/src/service/apiurl.js index 7d8558ec7..e1302e700 100644 --- a/src/service/apiurl.js +++ b/src/service/apiurl.js @@ -252,7 +252,8 @@ const apiurl = { sjtjcx: { sycx: { page: service_fxdd + '/osmoticPressR/page', - list:service_fxdd + "/attDamProfile/list" + list: service_fxdd + "/attDamProfile/list", + list1:service_fxdd + '/osmoticPressR/list/dvcd' }, slcx: { page:service_fxdd + '/osmoticFlowR/page' diff --git a/src/views/gcaqjc/sjtjcx/sjlr/sy/form.js b/src/views/gcaqjc/sjtjcx/sjlr/sy/form.js index 8cb5eed83..a33e00505 100644 --- a/src/views/gcaqjc/sjtjcx/sjlr/sy/form.js +++ b/src/views/gcaqjc/sjtjcx/sjlr/sy/form.js @@ -3,7 +3,7 @@ import { Form, Button, Input, Row, Col, DatePicker, Upload,message,Image,Modal,R import { formItemLayout, btnItemLayout } from '../../../../../components/crud/FormLayoutProps'; import apiurl from '../../../../../service/apiurl'; import NormalSelect from '../../../../../components/Form/NormalSelect'; -import { httppost2 } from '../../../../../utils/request'; +import { httppost2,httpget2 } from '../../../../../utils/request'; import moment from 'moment'; const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { @@ -11,8 +11,8 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { const [form] = Form.useForm(); const [dmList, setDmList] = useState([]) const [codeList, setCodeList] = useState([]) - const [dmCode,setDmCode] = useState('') - + const [dmCd,setDmCd] = useState([]) + const onFinish = (values) => { if (mode === 'edit') { onEdit(apiurl.gcaqjc.sjtjcx.sjlr.syjc.edit,{...record,...values}) @@ -42,11 +42,21 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { console.log(error); } } + + const getCdCode = async () => { + try { + const res = await httpget2(apiurl.gcaqjc.sjtjcx.sycx.list1) + setDmCd(res.data.map(s=>({label:s,value:s}))); + } catch (error) { + console.log(error); + } + } useEffect(()=>{ getDmList() getStationCode() + getCdCode() }, []) return ( @@ -83,12 +93,26 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { name="mpcd" > ({ label: o.mpcd, value: o.mpcd }))} /> + + + + + { getValueFromEvent={(e,dateString) => dateString} getValueProps={(value) => ({ value: value ? moment(value) : undefined })} > - + diff --git a/src/views/gcaqjc/sjtjcx/sjlr/sy/index.js b/src/views/gcaqjc/sjtjcx/sjlr/sy/index.js index dda8f6784..2b1962326 100644 --- a/src/views/gcaqjc/sjtjcx/sjlr/sy/index.js +++ b/src/views/gcaqjc/sjtjcx/sjlr/sy/index.js @@ -19,7 +19,7 @@ const Page = () => { const [searchVal, setSearchVal] = useState(false) const columns = [ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" }, - { title: '水库代码', key: 'rscd', dataIndex: 'rscd', width: 200, ellipsis: true, align:"center" }, + { title: '测点名称', key: 'dvcd', dataIndex: 'dvcd', width: 200, ellipsis: true, align:"center" }, { title: '水工建筑物编号', key: 'hycncd', dataIndex: 'hycncd', width: 200, align:"center"}, { title: '测点编号', key: 'mpcd', dataIndex: 'mpcd', width: 200, align:"center"}, { title: '测量时间', key: 'mstm', dataIndex: 'mstm', width: 200, align:"center"}, diff --git a/src/views/gcaqjc/sjtjcx/sjlr/sy/toolbar.js b/src/views/gcaqjc/sjtjcx/sjlr/sy/toolbar.js index eabb5c798..10becbe76 100644 --- a/src/views/gcaqjc/sjtjcx/sjlr/sy/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/sjlr/sy/toolbar.js @@ -5,7 +5,7 @@ import AdcdFuzzyTreeSelect from '../../../../../components/Form/AdcdFuzzyTreeSel import NormalSelect from '../../../../../components/Form/NormalSelect'; import { config } from '../../../../../config'; import moment from 'moment'; -import { httppost2 } from '../../../../../utils/request'; +import { httppost2,httpget2 } from '../../../../../utils/request'; import apiurl from '../../../../../service/apiurl'; const { RangePicker } = DatePicker; const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { @@ -50,8 +50,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { const getStationCode = async () => { try { - const res = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.list) - setCodeList(res.data.map(s=>({label:s.mpcd,value:s.mpcd,profileCode:s.mpcd}))); + const res = await httpget2(apiurl.gcaqjc.sjtjcx.sycx.list1) + setCodeList(res.data.map(s=>({label:s,value:s,profileCode:s}))); } catch (error) { console.log(error); } @@ -124,12 +124,12 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { style={{ width: "150px" }} options={dmList} onChange={(v)=>{ - form.setFieldValue('stationCode',null) + form.setFieldValue('dvcd',null) setDmCode(v) }} /> - + { @@ -49,8 +49,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { const getStationCode = async () => { try { - const res = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.list) - setCodeList(res.data.map(s=>({label:s.mpcd,value:s.mpcd,profileCode:s.mpcd}))); + const res = await httpget2(apiurl.gcaqjc.sjtjcx.sycx.list1) + setCodeList(res.data.map(s=>({label:s,value:s,profileCode:s}))); } catch (error) { console.log(error); } @@ -132,12 +132,12 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { style={{ width: "150px" }} options={dmList} onChange={(v)=>{ - form.setFieldValue('mpcd',null) + form.setFieldValue('dvcd',null) setDmCode(v) }} /> - +