diff --git a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js b/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
index df37a6ebf..03dc12f78 100644
--- a/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
+++ b/src/views/Home/homePanelsLayoutPage/item_gongcheng.js
@@ -29,11 +29,11 @@ const Page = () => {
]
}else{
return [
- { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center",width: 80, ellipsis: true },
+ { 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)=>
{v?.slice(5,10)}
{v?.slice(11,16)}
},
- { title: , key: 'x', dataIndex: 'x',align: "center", ellipsis: true, render:(v,row)=>{v}
},
- { title: , key: 'y', dataIndex: 'y',align: "center", ellipsis: true, render:(v,row)=>{v}
},
- { title: , key: 'h', dataIndex: 'h',align: "center", ellipsis: true, render:(v,row)=>{v}
},
+ { title: , key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=>{v}
},
+ { title: , key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=>{v}
},
+ { title: , key: 'du', dataIndex: 'du',align: "center", ellipsis: true, render:(v,row)=>{v}
},
]
}
}, [checked]);
@@ -89,7 +89,10 @@ const Page = () => {
{v?.slice(5,10)}
{v?.slice(11,16)}
},
- { title: , key: 'x', dataIndex: 'x',align: "center", ellipsis: true, render:(v,row)=>{v}
},
- { title: , key: 'y', dataIndex: 'y',align: "center", ellipsis: true, render:(v,row)=>{v}
},
- { title: , key: 'h', dataIndex: 'h',align: "center", ellipsis: true, render:(v,row)=>{v}
},
+ { title: , key: 'de', dataIndex: 'de',align: "center", ellipsis: true, render:(v,row)=>{v}
},
+ { title: , key: 'dn', dataIndex: 'dn',align: "center", ellipsis: true, render:(v,row)=>{v}
},
+ { title: , key: 'du', dataIndex: 'du',align: "center", ellipsis: true, render:(v,row)=>{v}
},
]
@@ -194,8 +194,13 @@ export default function Page({isHome}) {
({
diff --git a/src/views/gcaqjc/sjtjcx/ndsltjb/index.js b/src/views/gcaqjc/sjtjcx/ndsltjb/index.js
index edb40a265..2561fce2c 100644
--- a/src/views/gcaqjc/sjtjcx/ndsltjb/index.js
+++ b/src/views/gcaqjc/sjtjcx/ndsltjb/index.js
@@ -70,7 +70,7 @@ const Page = () => {
let newArr = [];
let newData = res.data?.map((s, i) => {
newArr.push(s.list?.map(c => ({
- [c.stationCode]: c.value || '-',
+ [c.stationCode]: (c.value || c.value == 0) ? c.value : '-',
tm:c.tm
})))
return {
diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/index.js b/src/views/gcaqjc/sjtjcx/ndwytjb/index.js
index 3b91bfb51..aa851779c 100644
--- a/src/views/gcaqjc/sjtjcx/ndwytjb/index.js
+++ b/src/views/gcaqjc/sjtjcx/ndwytjb/index.js
@@ -83,7 +83,7 @@ const Page = () => {
let newArr = [];
let newData = res.data?.map((s, i) => {
newArr.push(s.list?.map((c, i) => ({
- [c.cd]: c.value || '-',
+ [c.cd]: (c.value || c.value == 0) ? c.value : '-',
[`e_${c.cd}`]:c.de ,
[`n_${c.cd}`]:c.dn ,
[`u_${c.cd}`]:c.du ,
@@ -171,7 +171,7 @@ const Page = () => {
}
getTable2Data(params)
}
- }, [trData,wyObj])
+ }, [trData,wyObj,searchVal])
useEffect(() => {
getDmTree()
diff --git a/src/views/rcgl/byfz/bypc/index.js b/src/views/rcgl/byfz/bypc/index.js
index 3e5948157..befb635cd 100644
--- a/src/views/rcgl/byfz/bypc/index.js
+++ b/src/views/rcgl/byfz/bypc/index.js
@@ -83,8 +83,8 @@ const Page = () => {
},
{
title: '测点编号',
- dataIndex: 'mnNo',
- key: 'mnNo',
+ dataIndex: 'order',
+ key: 'order',
width: 120,
align:'center'
},
diff --git a/src/views/rcgl/byfz/bypc/toolbar.js b/src/views/rcgl/byfz/bypc/toolbar.js
index 033b9bcee..7d1b4afd5 100644
--- a/src/views/rcgl/byfz/bypc/toolbar.js
+++ b/src/views/rcgl/byfz/bypc/toolbar.js
@@ -37,7 +37,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
style={{ width: "240px" }}
/>
-
+