diff --git a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js b/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
index d8539d0b9..3d1e2e4f3 100644
--- a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
+++ b/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
@@ -20,22 +20,56 @@ const Page = () => {
if(checked==='渗压监测'){
return [
{ title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center", ellipsis: true },
- { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true, render:(v,row)=>
{v?.slice(5,16)}
},
- { title: '管水位(m)', key: 'value', dataIndex: 'value',align: "center", ellipsis: true, render:(v,row)=>{v}
},
+ {
+ title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 150, ellipsis: true,
+ // render: (v, row) => {v?.slice(5, 16)}
+ render: (v, row) => {v?.slice(5, 16)}
+ },
+ {
+ title: '管水位(m)', key: 'value', dataIndex: 'value', align: "center", ellipsis: true,
+ // render: (v, row) => {v}
+ render: (v, row) => {v}
+ }
]
}else if(checked === '渗流监测'){
return [
{ title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center", ellipsis: true },
- { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true, render:(v,row)=>{v?.slice(5,16)}
},
- { title: '渗流量(L/s)', key: 'value', dataIndex: 'value',align: "center", ellipsis: true, render:(v,row)=>{v}
},
+ {
+ title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 150, ellipsis: true,
+ // render: (v, row) => {v?.slice(5, 16)}
+ render: (v, row) => {v?.slice(5, 16)}
+ },
+ {
+ title: '渗流量(L/s)', key: 'value', dataIndex: 'value', align: "center", ellipsis: true,
+ // render: (v, row) => {v}
+ render: (v, row) => {v}
+ },
+
]
}else{
return [
{ title: '监测点', key: 'cdnm', dataIndex: 'cdnm',align: "center",width: 80, ellipsis: true },
- { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 80, ellipsis: true, render:(v,row)=>{v?.slice(5,10)}
{v?.slice(11,16)|| '-'}
},
- { title: , key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=>{v !== null ?v: '-'}
},
- { title: , key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=>{v !== null ?v: '-'}
},
- { title: , key: 'du', dataIndex: 'du',align: "center", ellipsis: true, render:(v,row)=>{v !== null ?v: '-'}
},
+ {
+ title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 80, ellipsis: true,
+ // render: (v, row) => {v?.slice(5, 10)}
{v?.slice(11, 16) || '-'}
+ render: (v, row) => {v?.slice(5, 10)}
{v?.slice(11, 16) || '-'}
+ },
+ {
+ title: , key: 'de', dataIndex: 'de', align: "center", ellipsis: true,
+ // render: (v, row) => {v !== null ? v : '-'}
+ render: (v, row) => {v !== null ? v : '-'}
+ },
+ {
+ title: , key: 'dn', dataIndex: 'dn', align: "center", ellipsis: true,
+ // render: (v, row) => {v !== null ? v : '-'}
+ render: (v, row) => {v !== null ? v : '-'}
+ },
+ {
+ title: , key: 'du', dataIndex: 'du', align: "center", ellipsis: true,
+ // render: (v, row) => {v !== null ? v : '-'}
+ render: (v, row) => {v !== null ? v : '-'}
+ },
+
]
}
}, [checked]);
diff --git a/src/views/gcaqjc/bzt2/index.js b/src/views/gcaqjc/bzt2/index.js
index 9eacf565b..78cadf9b9 100644
--- a/src/views/gcaqjc/bzt2/index.js
+++ b/src/views/gcaqjc/bzt2/index.js
@@ -37,22 +37,54 @@ export default function Page({ isHome }) {
const columnsSy = [
{ title: '监测点', key: 'stationCode', dataIndex: 'stationCode', align: "center", ellipsis: true },
{ title: '所属断面', key: 'profileName', dataIndex: 'profileName', width: 110, align: "center", ellipsis: true },
- { title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 110, ellipsis: true, render: (v, row) => {v?.slice(5, 16)}
},
- { title: '管水位(m)', key: 'value', dataIndex: 'value', align: "center", ellipsis: true, render: (v, row) => {v}
},
+ {
+ title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 110, ellipsis: true,
+ // render: (v, row) => {v?.slice(5, 16)}
+ render: (v, row) => {v?.slice(5, 16)}
+ },
+ {
+ title: '管水位(m)', key: 'value', dataIndex: 'value', align: "center", ellipsis: true,
+ // render: (v, row) => {v}
+ render: (v, row) => {v}
+ },
]
const columnsSl = [
{ title: '监测点', key: 'stationCode', dataIndex: 'stationCode', align: "center", ellipsis: true },
- { title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 150, ellipsis: true, render: (v, row) => {v?.slice(5, 16)}
},
- { title: '渗流量(L/s)', key: 'value', dataIndex: 'value', align: "center", ellipsis: true, render: (v, row) => {v}
},
+ {
+ title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 150, ellipsis: true,
+ // render: (v, row) => {v?.slice(5, 16)}
+ render: (v, row) => {v?.slice(5, 16)}
+ },
+ {
+ title: '渗流量(L/s)', key: 'value', dataIndex: 'value', align: "center", ellipsis: true,
+ // render: (v, row) => {v}
+ render: (v, row) => {v}
+ },
]
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) => {v?.slice(5, 10)}
{v?.slice(11, 16) || '-'}
},
- { title: , key: 'de', dataIndex: 'de', align: "center", ellipsis: true, render: (v, row) => {v !== null ?v: '-'}
},
- { title: , key: 'dn', dataIndex: 'dn', align: "center", ellipsis: true, render: (v, row) => {v !== null ?v: '-'}
},
- { title: , key: 'du', dataIndex: 'du', align: "center", ellipsis: true, render: (v, row) => {v !== null ?v: '-'}
},
+ {
+ title: '监测时间', key: 'tm', dataIndex: 'tm', align: "center", width: 80, ellipsis: true,
+ // render: (v, row) => {v?.slice(5, 10)}
{v?.slice(11, 16) || '-'}
+ render: (v, row) => {v?.slice(5, 10)}
{v?.slice(11, 16) || '-'}
+ },
+ {
+ title: , key: 'de', dataIndex: 'de', align: "center", ellipsis: true,
+ // render: (v, row) => {v !== null ? v : '-'}
+ render: (v, row) => {v !== null ? v : '-'}
+ },
+ {
+ title: , key: 'dn', dataIndex: 'dn', align: "center", ellipsis: true,
+ // render: (v, row) => {v !== null ? v : '-'}
+ render: (v, row) => {v !== null ? v : '-'}
+ },
+ {
+ title: , key: 'du', dataIndex: 'du', align: "center", ellipsis: true,
+ // render: (v, row) => {v !== null ? v : '-'}
+ render: (v, row) => {v !== null ? v : '-'}
+ },
]