Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/tsg-web
commit
7544378b89
|
|
@ -31,9 +31,9 @@ const Page = () => {
|
|||
return [
|
||||
{ title: '监测点', key: 'cd', dataIndex: 'cd',align: "center",width: 80, ellipsis: true },
|
||||
{ title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 80, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}><div>{v?.slice(5,10)}</div><div>{v?.slice(11,16)}</div></div> },
|
||||
{ title: <div><div>e方向</div><div>(mm)</div></div>, key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.xstatus===1?'red':'#3B4859'}}>{v}</div> },
|
||||
{ title: <div><div>n方向</div><div>(mm)</div></div>, key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.ystatus===1?'red':'#3B4859'}}>{v}</div> },
|
||||
{ title: <div><div>u方向</div><div>(mm)</div></div>, key: 'du', dataIndex: 'du',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.hstatus===1?'red':'#3B4859'}}>{v}</div> },
|
||||
{ title: <div><div>x方向</div><div>(mm)</div></div>, key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.xstatus===1?'red':'#3B4859'}}>{v}</div> },
|
||||
{ title: <div><div>y方向</div><div>(mm)</div></div>, key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.ystatus===1?'red':'#3B4859'}}>{v}</div> },
|
||||
{ title: <div><div>h方向</div><div>(mm)</div></div>, key: 'du', dataIndex: 'du',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.hstatus===1?'red':'#3B4859'}}>{v}</div> },
|
||||
]
|
||||
}
|
||||
}, [checked]);
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 654 KiB After Width: | Height: | Size: 597 KiB |
|
|
@ -46,9 +46,9 @@ export default function Page({isHome}) {
|
|||
const columnsWy = [
|
||||
{ title: '监测点', key: 'cdnm', dataIndex: 'cdnm',align: "center",width: 150, ellipsis: true },
|
||||
{ title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 80, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}><div>{v?.slice(5,10)}</div><div>{v?.slice(11,16)}</div></div> },
|
||||
{ title: <div><div>e方向</div><div>(mm)</div></div>, key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.xstatus===1?'red':'#3B4859'}}>{v}</div> },
|
||||
{ title: <div><div>n方向</div><div>(mm)</div></div>, key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.ystatus===1?'red':'#3B4859'}}>{v}</div> },
|
||||
{ title: <div><div>u方向</div><div>(mm)</div></div>, key: 'du', dataIndex: 'du',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.hstatus===1?'red':'#3B4859'}}>{v}</div> },
|
||||
{ title: <div><div>x方向</div><div>(mm)</div></div>, key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.xstatus===1?'red':'#3B4859'}}>{v}</div> },
|
||||
{ title: <div><div>y方向</div><div>(mm)</div></div>, key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.ystatus===1?'red':'#3B4859'}}>{v}</div> },
|
||||
{ title: <div><div>h方向</div><div>(mm)</div></div>, key: 'du', dataIndex: 'du',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.hstatus===1?'red':'#3B4859'}}>{v}</div> },
|
||||
]
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
|
|||
const type4 = ["UPD11", "UPD14"];
|
||||
const type5 = ["UPD3", "UPD6", "UPD9"];
|
||||
const type6 = ["UPD12", "UPD15"];
|
||||
|
||||
// 管底高程
|
||||
|
||||
const alltype = typeName == "1" ? type1 :
|
||||
typeName == "2" ? type2 :
|
||||
typeName == "3" ? type3 :
|
||||
|
|
@ -52,30 +55,30 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
|
|||
[]
|
||||
// gz1、gz2、gz3、gz4分别为渗压管
|
||||
const gz1 = data[alltype[0]] ?
|
||||
type == "3" ? [[47, 101], [47, data[alltype[0]]]] :
|
||||
type == "2" ? [[45.5, 98], [45.5, data[alltype[0]]]] :
|
||||
type == "1" ? [[44, 83], [44, data[alltype[0]]]] :
|
||||
type == "3" ? [[47, typeName =='5' ?76.56:92.18], [47, data[alltype[0]]]] :
|
||||
type == "2" ? [[45.5, typeName =='3' ?76.16:77.18], [45.5, data[alltype[0]]]] :
|
||||
type == "1" ? [[44, typeName =='1' ?79.16:77.18], [44, data[alltype[0]]]] :
|
||||
[[47.5, 158], [85, data[alltype[0]]]]
|
||||
: [];
|
||||
|
||||
const gz2 = data[alltype[1]] ?
|
||||
type == "3" ? [[51, 101], [51, data[alltype[1]]]] :
|
||||
type == "2" ? [[50, 98], [50, data[alltype[1]]]] :
|
||||
type == "1" ? [[51.5, 82], [51.5, data[alltype[1]]]] :
|
||||
type == "3" ? [[51, typeName =='5' ?77.18:83.50], [51, data[alltype[1]]]] :
|
||||
type == "2" ? [[50, typeName =='3' ?77.18:77.50], [50, data[alltype[1]]]] :
|
||||
type == "1" ? [[51.5, typeName =='1' ?77.18:74.5], [51.5, data[alltype[1]]]] :
|
||||
[[53.6, 158], [53.6, data[alltype[1]]]] :
|
||||
[];
|
||||
|
||||
const gz3 = data[alltype[2]] ?
|
||||
type == "3" ? [[58.5, 95], [58.5, data[alltype[2]]]] :
|
||||
type == "2" ? [[58, 92], [58, data[alltype[2]]]] :
|
||||
type == "1" ? [[58, 81], [58, data[alltype[2]]]] :
|
||||
type == "3" ? [[58.5, 81.50], [58.5, data[alltype[2]]]] :
|
||||
type == "2" ? [[58, 80.50], [58, data[alltype[2]]]] :
|
||||
type == "1" ? [[58, 66.50], [58, data[alltype[2]]]] :
|
||||
[[73, 161], [73, data[alltype[2]]]] : [];
|
||||
|
||||
|
||||
const gz4 = data[alltype[3]] ?
|
||||
type == "3" ? [] :
|
||||
type == "2" ? [[77, 82], [77, data[alltype[3]]]] :
|
||||
type == "1" ? [[79, 78], [79, data[alltype[3]]]] :
|
||||
type == "2" ? [[77, 73.50], [77, data[alltype[3]]]] :
|
||||
type == "1" ? [[79, 72.50], [79, data[alltype[3]]]] :
|
||||
[[85, 166], [85, data[alltype[3]]]] : [];
|
||||
|
||||
// 将渗压管连起来的线
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ const Page = () => {
|
|||
const [table2Data, setTable2Data] = useState([])
|
||||
const [loading, setLoading] = useState(false)
|
||||
const [wyObj, setWyObj] = useState(false)
|
||||
const wyList = ["e","n","u"]
|
||||
const wyList = ["x","y","h"]
|
||||
const columns1 = [
|
||||
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 150, align:"center"},
|
||||
];
|
||||
|
|
@ -84,9 +84,9 @@ const Page = () => {
|
|||
let newData = res.data?.map((s, i) => {
|
||||
newArr.push(s.list?.map((c, i) => ({
|
||||
[c.cd]: (c.value || c.value == 0) ? c.value : '-',
|
||||
[`e_${c.cd}`]:c.de ,
|
||||
[`n_${c.cd}`]:c.dn ,
|
||||
[`u_${c.cd}`]:c.du ,
|
||||
[`x_${c.cd}`]:c.de ,
|
||||
[`y_${c.cd}`]:c.dn ,
|
||||
[`h_${c.cd}`]:c.du ,
|
||||
tm: c.tm,
|
||||
})))
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ const ToolBar = ({ setSearchVal, setDmName, exportFile, role,list,setWyObj }) =>
|
|||
useEffect(() => {
|
||||
let time = moment()
|
||||
form.setFieldValue("tm", time)
|
||||
form.setFieldValue("wy","07")
|
||||
form.setFieldValue("wy","01")
|
||||
setSearchVal({ year: moment().format("YYYY")})
|
||||
setWyObj({ wy: "07"})
|
||||
setWyObj({ wy: "01"})
|
||||
}, [])
|
||||
useEffect(() => {
|
||||
if (list.length > 0) {
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ const Page = () => {
|
|||
{ 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: 'x方向变形值(mm)', key: 'de', dataIndex: 'de', width: 200, align:"center",
|
||||
},
|
||||
{ title: 'n方向变形值(mm)', key: 'dn', dataIndex: 'dn', width: 200, ellipsis: true,align:"center", },
|
||||
{ title: 'y方向变形值(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: 'h方向变形值(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"},
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ const Page = () => {
|
|||
const columns = [
|
||||
{ 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: '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", },
|
||||
|
|
|
|||
|
|
@ -16,8 +16,9 @@ const Page = () => {
|
|||
const columns = [
|
||||
{ title: '序号', key: 'inx', dataIndex: 'inx', width: 60, 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: 'dmName', dataIndex: 'dmName', 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", },
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue