lishenfeng
/
tsg-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat():渗流、渗压、位移字段修改

qzc-dev
李神峰 2025-09-01 17:55:23 +08:00
parent 77e9dede45
commit 46df02e1c5
18 changed files with 179 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,6 +10,7 @@
# production
/build
build.zip
# misc
.DS_Store

4
src/service/apiurl.js
View File

@ -9,6 +9,7 @@ const baseFileView = "http://223.75.53.141:9100/gs-tsg"//文件回显地址
const service_fxdd = '/gunshiApp/tsg'
const service_xyt = '/gunshiApp/tsg'//登陆先用小玉潭
const service_shzh = '/shzh'
const baseTest = "http://223.75.53.141:81/"
const apiurl = {
zsk: {
ddfa: {
@ -565,7 +566,8 @@ const apiurl = {
srcData: service_fxdd + '/attCctvBase/preview/',
videoBystcd: service_fxdd + '/stbprp/cctv/listByStcd/',
videoList:service_fxdd + '/attCctvBase/list',
ysyToken:service_fxdd + '/ysy/getAccessToken'
ysyToken: service_fxdd + '/ysy/getAccessToken',
preview:baseTest + 'isc/liveAddressLimited'
},
//基本情况
jbqk: {

12
src/views/gcaqjc/sjtjcx/ndsltjb/index.js
View File

@ -49,9 +49,9 @@ const Page = () => {
width: 100,
align: "center",
children: trData?.map(item => ({
title: item.stationCode,
key: item.stationCode,
dataIndex: item.stationCode,
title: item.mpcd,
key: item.mpcd,
dataIndex: item.mpcd,
width: 100,
align: "center",
render: (rec, record) => <span>{rec?? "-"}</span>
@ -106,7 +106,7 @@ const Page = () => {
const exportExcel = () => {
let params = {
...searchVal,
stationCodes: trData.map(s => s.stationCode),
stationCodes: trData.map(s => s.mpcd),
type:2,
id:1
}
@ -126,7 +126,7 @@ const Page = () => {
if (trData && trData.length > 0) {
const params = {
...searchVal,
stationCodes: trData.map(s => s.stationCode),
stationCodes: trData.map(s => s.mpcd),
type:2
};
getTableData(params)
@ -138,7 +138,7 @@ const Page = () => {
if (trData && trData?.length > 0) {
let params = {
...searchVal,
stationCodes:trData.map(s => s.stationCode),
stationCodes:trData.map(s => s.mpcd),
type:2
}
getTable2Data(params)

22
src/views/gcaqjc/sjtjcx/ndwytjb/index.js
View File

@ -16,7 +16,7 @@ const Page = () => {
const [table2Data, setTable2Data] = useState([])
const [loading, setLoading] = useState(false)
const [wyObj, setWyObj] = useState(false)
const wyList = ["X","Y","H"]
const wyList = ["e","n","u"]
const columns1 = [
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 150, align:"center"},
];
@ -55,13 +55,13 @@ const Page = () => {
if (trData.length > 0 && wyObj) {
let dm = trData?.map(item => (
{
title: item.stationCode,
title: item.cd,
width: 100,
align: "center",
children: wyList?.map(s => ({
title: s,
key: `${s}_${item.stationCode}`,
dataIndex: `${s}_${item.stationCode}`,
key: `${s}_${item.cd}`,
dataIndex: `${s}_${item.cd}`,
width: 100,
align: "center",
render: (rec, record) => <span>{rec?? "-"}</span>
@ -83,10 +83,10 @@ const Page = () => {
let newArr = [];
let newData = res.data?.map((s, i) => {
newArr.push(s.list?.map((c, i) => ({
[c.stationCode]: c.value || '-',
[`X_${c.stationCode}`]:c.x ,
[`Y_${c.stationCode}`]:c.y ,
[`H_${c.stationCode}`]:c.h ,
[c.cd]: c.value || '-',
[`e_${c.cd}`]:c.de ,
[`n_${c.cd}`]:c.dn ,
[`u_${c.cd}`]:c.du ,
tm: c.tm,
})))
return {
@ -125,7 +125,7 @@ const Page = () => {
const exportExcel = () => {
let params = {
...searchVal,
stationCodes: [trData.find(s => s.stationCode == wyObj.wy)?.stationCode],
stationCodes: [trData.find(s => s.cd == wyObj.wy)?.cd],
type:2,
id:1
}
@ -156,7 +156,7 @@ const Page = () => {
if (trData && trData.length > 0) {
const params = {
...searchVal,
stationCodes: trData.map(s => s.stationCode),
stationCodes: trData.map(s => s.cd),
};
getTableData(params)
@ -167,7 +167,7 @@ const Page = () => {
if (trData && trData?.length > 0) {
let params = {
...searchVal,
stationCodes:[trData.find(s => s.stationCode == wyObj.wy)?.stationCode],
stationCodes:[trData.find(s => s.cd == wyObj.wy)?.cd],
}
getTable2Data(params)
}

8
src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js
View File

@ -31,15 +31,15 @@ const ToolBar = ({ setSearchVal, setDmName, exportFile, role,list,setWyObj }) =>
useEffect(() => {
let time = moment()
form.setFieldValue("tm", time)
form.setFieldValue("wy","WY-01")
form.setFieldValue("wy","07")
setSearchVal({ year: moment().format("YYYY")})
setWyObj({ wy: "WY-01"})
setWyObj({ wy: "07"})
}, [])
useEffect(() => {
if (list.length > 0) {
const newList = list.map(item => ({
label: item.stationCode,
value:item.stationCode
label: item.cd,
value:item.cd
}))
setSource(newList)
}

100
src/views/gcaqjc/sjtjcx/sjlr/sy/form.js
View File

@ -37,7 +37,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
const getStationCode = async () => {
try {
const res = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.list)
setCodeList(res.data.map(s=>({label:s.stationCode,value:s.stationCode,profileCode:s.profileCode})));
setCodeList(res.data);
} catch (error) {
console.log(error);
}
@ -58,94 +58,60 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
initialValues={record}
>
<Row>
<Col span={12}>
<Col span={12}>
<Form.Item
label="监测时间"
name="tm"
getValueFromEvent={(e,dateString) => dateString}
getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
rules={[{required: true}]}
>
<DatePicker disabled={mode==='view'||mode==='edit'} format={'YYYY-MM-DD HH:mm:ss'} style={{width:'100%'}} allowClear showTime />
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label="监测断面"
name="profileCode"
label="水库代码"
name="rscd"
rules={[{ required: true }]}
>
<NormalSelect
disabled={mode==='view'||mode==='edit'}
allowClear
style={{ width: "100%" }}
options={dmList}
onChange={(v)=>{
form.setFieldValue('stationCode',null)
setDmCode(v)
}}
/>
<Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>
</Col>
</Row>
<Row>
</Col>
<Col span={12}>
<Form.Item
label="水工建筑物编号"
name="hycncd"
rules={[{ required: true }]}
>
<Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label="测点编号"
rules={[{ required: true }]}
name="stationCode"
name="mpcd"
>
<NormalSelect
disabled={mode==='view'||mode==='edit'}
disabled={true}
allowClear
style={{ width: "100%" }}
options={codeList.filter(o=>dmCode?o.profileCode===dmCode:true)}
options={codeList.map(o => ({ label: o.mpcd, value: o.mpcd }))}
/>
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label="通道号"
rules={[{ required: true }]}
name="chan"
label="测量时间"
name="mstm"
getValueFromEvent={(e,dateString) => dateString}
getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
>
<InputNumber disabled={mode==='view'} style={{width:'100%'}} allowClear />
<DatePicker disabled={true} format={'YYYY-MM-DD HH:mm:ss'} style={{width:'100%'}} allowClear showTime />
</Form.Item>
</Col>
</Row>
<Row>
<Col span={12}>
<Form.Item
label="测压管水位(m)"
name="value"
>
<InputNumber disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label="渗压(KPa)"
name="press"
>
<InputNumber disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>
</Col>
</Row>
<Row>
<Col span={12}>
<Form.Item
label="振弦(Hz)"
name="vib"
>
<InputNumber disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>
</Col>
</Col>
<Col span={12}>
<Form.Item
label="温度(℃)"
name="temp"
name="tm"
>
<InputNumber disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label="渗流压力水位(m)"
name="spprwl"
>
<InputNumber disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>

20
src/views/gcaqjc/sjtjcx/sjlr/sy/index.js
View File

@ -18,14 +18,16 @@ const Page = () => {
const refModal = useRef();
const [searchVal, setSearchVal] = useState(false)
const columns = [
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
{ title: '监测时间', key: 'tm', dataIndex: 'tm', align:"center", },
{ title: '监测断面', key: 'profileName', dataIndex: 'profileName', align:"center", },
{ title: '测点编号', key: 'stationCode', dataIndex: 'stationCode', align:"center", },
{ title: '测压管水位(m)', key: 'value', dataIndex: 'value', align:"center", },
{ title: '渗压(KPa)', key: 'press', dataIndex: 'press', align:"center", },
{ title: '振弦(Hz)', key: 'vib', dataIndex: 'vib', align:"center", },
{ title: '温度(℃)', key: 'temp', dataIndex: 'temp', align:"center", },
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
{ title: '水库代码', key: 'rscd', dataIndex: 'rscd', 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"},
{ title: '温度(°C)', key: 'tm', dataIndex: 'tm', width: 250, ellipsis: true,align:"center", },
{
title: '渗流压力水位(m)', key: 'spprwl', dataIndex: 'spprwl', width: 200, align:"center",
},
{ title: '更新时间', key: 'updateTm', dataIndex: 'updateTm', width: 200, ellipsis: true,align:"center", },
{
title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
render: (value, row, index) => (
@ -48,7 +50,7 @@ const Page = () => {
} else if (type === 'view') {
refModal.current.showView(params);
} else if (type === 'del') {
const url = apiurl.gcaqjc.sjtjcx.sjlr.syjc.del + params.stationCode+'/'+params.tm
const url = apiurl.gcaqjc.sjtjcx.sjlr.syjc.del + params.mpcd+'/'+params.mstm
refModal.current.onDeleteGet(url);
}
}

2
src/views/gcaqjc/sjtjcx/sjlr/sy/toolbar.js
View File

@ -51,7 +51,7 @@ 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.stationCode,value:s.stationCode,profileCode:s.profileCode})));
setCodeList(res.data.map(s=>({label:s.mpcd,value:s.mpcd,profileCode:s.mpcd})));
} catch (error) {
console.log(error);
}

87
src/views/gcaqjc/sjtjcx/sjlr/wy/form.js
View File

@ -14,7 +14,6 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
const [dmCode,setDmCode] = useState('')
const onFinish = (values) => {
debugger
if (mode === 'edit') {
onEdit(apiurl.gcaqjc.sjtjcx.sjlr.wyjc.edit,{...record,...values})
}
@ -38,7 +37,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
const getStationCode = async () => {
try {
const res = await httppost2(apiurl.gcaqjc.sjtjcx.wycx.list)
setCodeList(res.data.map(s=>({label:s.stationCode,value:s.stationCode,profileCode:s.profileCode})));
setCodeList(res.data);
} catch (error) {
console.log(error);
}
@ -58,6 +57,55 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
onFinish={onFinish}
initialValues={record}
>
<Form.Item
label="水库编码设备编码"
rules={[{ required: true }]}
name="resCd"
>
<NormalSelect
disabled={mode==='view'}
allowClear
style={{ width: "100%" }}
options={codeList.map(s=>({label:s.resCd,value:s.resCd}))}
/>
</Form.Item>
<Form.Item
label="测点编号"
rules={[{ required: true }]}
name="cd"
>
<NormalSelect
disabled={mode==='view'}
allowClear
style={{ width: "100%" }}
options={codeList.map(s=>({label:s.cd,value:s.cd}))}
/>
</Form.Item>
<Form.Item
label="e方向变形值(mm)"
name="de"
>
<Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>
<Form.Item
label="n方向变形值(mm)"
name="dn"
>
<Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>
<Form.Item
label="u方向变形值(mm)"
name="du"
>
<Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>
<Form.Item
label="站点高程(m)"
name="alt"
>
<Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>
<Form.Item
label="监测时间"
name="tm"
@ -65,39 +113,10 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
rules={[{required: true}]}
>
<DatePicker disabled={mode==='view'||mode==='edit'} format={'YYYY-MM-DD HH:mm:ss'} style={{width:'100%'}} allowClear showTime />
</Form.Item>
<Form.Item
label="测点编号"
rules={[{ required: true }]}
name="stationCode"
>
<NormalSelect
disabled={mode==='view'||mode==='edit'}
allowClear
style={{ width: "100%" }}
options={codeList}
/>
</Form.Item>
<Form.Item
label="X方向表面位移(mm)"
name="x"
>
<Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>
<Form.Item
label="Y方向表面位移(mm)"
name="y"
>
<Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
</Form.Item>
<Form.Item
label="H方向表面位移(mm)"
name="h"
>
<Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
<DatePicker disabled={mode==='view'} format={'YYYY-MM-DD HH:mm:ss'} style={{width:'100%'}} allowClear showTime />
</Form.Item>
{
mode==='view'?null:(
<>

20
src/views/gcaqjc/sjtjcx/sjlr/wy/index.js
View File

@ -18,12 +18,18 @@ const Page = () => {
const refModal = useRef();
const [searchVal, setSearchVal] = useState(false)
const columns = [
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
{ title: '监测时间', key: 'tm', dataIndex: 'tm', align:"center", },
{ title: '测点编号', key: 'stationCode', dataIndex: 'stationCode', align:"center", },
{ title: 'X方向表面位移(mm)', key: 'x', dataIndex: 'x', align:"center", },
{ title: 'Y方向表面位移(mm)', key: 'y', dataIndex: 'y', align:"center", },
{ title: 'H方向表面位移(mm)', key: 'h', dataIndex: 'h', align:"center", },
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
{ title: '水库编码设备编码', key: 'resCd', dataIndex: 'resCd', width: 200, ellipsis: true, align:"center" },
{ title: '测点编号', key: 'cd', dataIndex: 'cd', width: 200, align:"center"},
{
title: 'e方向变形值(mm)', key: 'de', dataIndex: 'de', width: 200, align:"center",
},
{ title: 'n方向变形值(mm)', key: 'dn', dataIndex: 'dn', width: 200, ellipsis: true,align:"center", },
{ title: 'u方向变形值(mm)', key: 'du', dataIndex: 'du', width: 200, ellipsis: true, align: "center", },
{ title: '站点高程', key: 'alt', dataIndex: 'alt', width: 200, align:"center"},
{ title: '监测时间', key: 'tm', dataIndex: 'tm', width: 200, align:"center"},
{ title: '更新时间', key: 'updateTm', dataIndex: 'updateTm', width: 200, align:"center"},
{
title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center',
render: (value, row, index) => (
@ -46,7 +52,7 @@ const Page = () => {
} else if (type === 'view') {
refModal.current.showView(params);
} else if (type === 'del') {
const url = apiurl.gcaqjc.sjtjcx.sjlr.wyjc.del + params.stationCode+'/'+params.tm
const url = apiurl.gcaqjc.sjtjcx.sjlr.wyjc.del + params.cd+'/'+params.tm
refModal.current.onDeleteGet(url);
}
}

2
src/views/gcaqjc/sjtjcx/sjlr/wy/toolbar.js
View File

@ -51,7 +51,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
const getStationCode = async () => {
try {
const res = await httppost2(apiurl.gcaqjc.sjtjcx.wycx.list)
setCodeList(res.data.map(s=>({label:s.stationCode,value:s.stationCode})));
setCodeList(res.data.map(s=>({label:s.cd,value:s.cd})));
} catch (error) {
console.log(error);
}

15
src/views/gcaqjc/sjtjcx/sljc/index.js
View File

@ -14,14 +14,17 @@ const Page = () => {
const [searchVal, setSearchVal] = useState(false)
const columns = [
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
{ title: '上报时间', key: 'tm', dataIndex: 'tm', width: 200, ellipsis: true, align:"center" },
{ title: '测点编号', key: 'stationCode', dataIndex: 'stationCode', width: 200, align:"center"},
{ title: '水库代码', key: 'rscd', dataIndex: 'rscd', 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"},
{ title: '温度(°C)', key: 'tm', dataIndex: 'tm', width: 250, ellipsis: true,align:"center", },
{ title: '渗流量(l/s)', key: 'spqn', dataIndex: 'spqn', width: 250, ellipsis: true,align:"center", },
{
title: '通道号', key: 'chan', dataIndex: 'chan', width: 200, align:"center",
title: '标准水温渗流量(l/s)', key: 'stspqn', dataIndex: 'stspqn', width: 200, align:"center",
},
{ title: '水深(mm)', key: 'l', dataIndex: 'l', width: 200, ellipsis: true,align:"center", },
{ title: '流量(L/s)', key: 'q', dataIndex: 'q', width: 250, ellipsis: true,align:"center", },
{ title: '创建时间', key: 'createTime', dataIndex: 'createTime', width: 200, ellipsis: true,align:"center" },
{ title: '更新时间', key: 'updateTm', dataIndex: 'updateTm', width: 200, ellipsis: true,align:"center" },
];

18
src/views/gcaqjc/sjtjcx/syjc/index.js
View File

@ -15,17 +15,15 @@ const Page = () => {
const [searchVal, setSearchVal] = useState(false)
const columns = [
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
{ title: '上报时间', key: 'tm', dataIndex: 'tm', width: 200, ellipsis: true, align:"center" },
{ title: '监测断面', key: 'profileName', dataIndex: 'profileName', width: 200, ellipsis: true, align:"center" },
{ title: '测点编号', key: 'stationCode', dataIndex: 'stationCode', width: 200, align:"center"},
{ title: '水库代码', key: 'rscd', dataIndex: 'rscd', 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"},
{ title: '温度(°C)', key: 'tm', dataIndex: 'tm', width: 250, ellipsis: true,align:"center", },
{
title: '通道号', key: 'chan', dataIndex: 'chan', width: 200, align:"center",
title: '渗流压力水位(m)', key: 'spprwl', dataIndex: 'spprwl', width: 200, align:"center",
},
{ title: '测压管水位(m)', key: 'value', dataIndex: 'value', width: 200, ellipsis: true,align:"center", },
{ title: '渗压(KPa)', key: 'press', dataIndex: 'press', width: 200, ellipsis: true,align:"center", },
{ title: '振弦(Hz)', key: 'vib', dataIndex: 'vib', width: 250, ellipsis: true,align:"center", },
{ title: '温度(°C)', key: 'temp', dataIndex: 'temp', width: 250, ellipsis: true,align:"center", },
{ title: '更新时间', key: 'updateTm', dataIndex: 'updateTm', width: 200, ellipsis: true,align:"center", },
];
@ -64,7 +62,7 @@ const Page = () => {
role={role}
/>
</Card>
<div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
<div className="ant-card-body" style={{padding:"20px 0 0 0",marginRight:20}}>
<Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
</div>
</div>

8
src/views/gcaqjc/sjtjcx/syjc/toolbar.js
View File

@ -50,7 +50,7 @@ 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.stationCode,value:s.stationCode,profileCode:s.profileCode})));
setCodeList(res.data.map(s=>({label:s.mpcd,value:s.mpcd,profileCode:s.mpcd})));
} catch (error) {
console.log(error);
}
@ -126,18 +126,18 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
options={optionsType}
/>
</Form.Item>
<Form.Item label="监测断面" name="profileCode">
<Form.Item label="监测断面" name="dm">
<NormalSelect
allowClear
style={{ width: "150px" }}
options={dmList}
onChange={(v)=>{
form.setFieldValue('stationCode',null)
form.setFieldValue('mpcd',null)
setDmCode(v)
}}
/>
</Form.Item>
<Form.Item label="测点编号" name="stationCode">
<Form.Item label="测点编号" name="mpcd">
<NormalSelect
allowClear
style={{ width: "150px" }}

13
src/views/gcaqjc/sjtjcx/wyjc/index.js
View File

@ -14,14 +14,17 @@ const Page = () => {
const [searchVal, setSearchVal] = useState(false)
const columns = [
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
{ title: '监测时间', key: 'tm', dataIndex: 'tm', width: 200, ellipsis: true, align:"center" },
{ title: '测点编号', key: 'stationCode', dataIndex: 'stationCode', width: 200, align:"center"},
{ title: '水库编码设备编码', key: 'resCd', dataIndex: 'resCd', width: 200, ellipsis: true, align:"center" },
{ title: '测点编号', key: 'cd', dataIndex: 'cd', width: 200, align:"center"},
{
title: 'X方向表面位移(mm)', key: 'x', dataIndex: 'x', width: 200, align:"center",
title: 'e方向变形值(mm)', key: 'de', dataIndex: 'de', width: 200, align:"center",
},
{ title: 'Y方向表面位移(mm)', key: 'y', dataIndex: 'y', width: 200, ellipsis: true,align:"center", },
{ title: 'n方向变形值(mm)', key: 'dn', dataIndex: 'dn', width: 200, ellipsis: true,align:"center", },
{ title: 'H方向表面位移(mm)', key: 'h', dataIndex: 'h', width: 200, ellipsis: true,align:"center", },
{ title: 'u方向变形值(mm)', key: 'du', dataIndex: 'du', width: 200, ellipsis: true, align: "center", },
{ title: '站点高程', key: 'alt', dataIndex: 'alt', width: 200, align:"center"},
{ title: '监测时间', key: 'tm', dataIndex: 'tm', width: 200, align:"center"},
{ title: '更新时间', key: 'updateTm', dataIndex: 'updateTm', width: 200, align:"center"},
];

4
src/views/gcaqjc/sjtjcx/wyjc/toolbar.js
View File

@ -40,7 +40,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
const getStationCode = async () => {
try {
const res = await httppost2(apiurl.gcaqjc.sjtjcx.wycx.list)
setCodeList(res.data.map(s=>({label:s.stationCode,value:s.stationCode})));
setCodeList(res.data.map(s=>({label:s.cdNm,value:s.cd})));
} catch (error) {
console.log(error);
}
@ -113,7 +113,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
options={optionsType}
/>
</Form.Item>
<Form.Item label="测点编号" name="stationCode">
<Form.Item label="测点编号" name="cd">
<NormalSelect
allowClear
style={{ width: "150px" }}

18
src/views/rcgl/byfz/bypc/index.js
View File

@ -76,23 +76,23 @@ const Page = () => {
const columns = [
{
title: '监测时间',
dataIndex: 'reportDate',
key: 'reportDate',
dataIndex: 'obDate',
key: 'obDate',
width: 180,
align:'center'
},
{
title: '测点编号',
dataIndex: 'pileNumber',
key: 'pileNumber',
dataIndex: 'mnNo',
key: 'mnNo',
width: 120,
align:'center'
},
{
title: '有无白蚁',
dataIndex: 'isHarm',
dataIndex: 'status',
align:'center',
key: 'isHarm',
key: 'status',
width: 100,
render:(text, record) => {
// 如果 isHarm 为 null 或 undefined，显示无
@ -105,10 +105,10 @@ const Page = () => {
return (
<Tag
color={text ? (isHandle ? '#04d919' : '#d9001b') : '#04d919'}
color={!text ?'#04d919' : '#d9001b'}
style={{borderRadius: '50%', padding: '4px 8px'}}
>
{text ? (isHandle ? '无' : '有') : '无'}
{!text ? '无' : '有'}
</Tag>
);
}
@ -220,7 +220,7 @@ const Page = () => {
// role={role}
/>
</Card>
<div className="ant-card-body" style={{ padding: "20px 0 0 0" }}>
<div className="ant-card-body" style={{ padding: "20px 0 0 0" ,marginRight:20}}>
<Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
</div>
</div>

4
src/views/rcgl/byfz/bypc/toolbar.js
View File

@ -15,7 +15,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
dateSo = moment(values.year).format('YYYY-MM-DD')
}
delete values.year
setSearchVal({...values, searchDate:dateSo});
setSearchVal({...values, obDate:dateSo});
}
// useEffect(() => {
@ -37,7 +37,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
style={{ width: "240px" }}
/>
</Form.Item>
<Form.Item label="测点编号" name="pileNumber">
<Form.Item label="测点编号" name="mnNo">
<Input
allowClear
style={{ width: "240px" }}