@@ -34,22 +39,22 @@ export default function Sksq() {
- 土壤墒情
+ 实时数据
-
- 土壤墒情
+ 实时数据
- 站点：
- {selectList?.[0]?.stnm}
- {/*
+ 站点：
+ {/* {selectList?.[0]?.stnm} */}
+ setSelected(e)}
- /> */}
+ />
-
@@ -60,7 +65,7 @@ export default function Sksq() {
-
diff --git a/src/views/sq/qth/skyh/index.less b/src/views/sq/qth/skyh/index.less
index 5f242010a..da2859358 100644
--- a/src/views/sq/qth/skyh/index.less
+++ b/src/views/sq/qth/skyh/index.less
@@ -87,6 +87,7 @@
padding: 0 10px;
display: flex;
flex-direction: row;
+ min-height: 600px;
.qth_skyh_sjcx_center_left{
width: 55%;
height: 100%;
diff --git a/src/views/sq/qth/skyh/sjcx.js b/src/views/sq/qth/skyh/sjcx.js
index 71d70f048..3db4a46fe 100644
--- a/src/views/sq/qth/skyh/sjcx.js
+++ b/src/views/sq/qth/skyh/sjcx.js
@@ -12,40 +12,37 @@ export default function Sjcx({ data }) {
const stcd = data?.stcd||''
const [tms, setTms] = useState([moment().add(-1,'months'),moment()])
const [list, setList] = useState([])
- const option = useMemo(() => drpOption(list), [list])
+ const option = useMemo(() => drpOption(list,data), [list])
const columns = [
{ title: '时间', key: 'tm', dataIndex: 'tm', align: 'center',width:'120px',render: (rec) => {rec.slice(5,16) ?? "-"} },
- { title: '水位(m)', key: 'sw', dataIndex: 'sw', align: 'center',width:'80px',render: (rec) => {rec ?? "-"} },
- { title: '库容(万m³)', key: 'kr', dataIndex: 'kr', align: 'center',render: (rec) => {rec ?? "-"} },
- { title: '溢洪流量(m³/s)', key: 'll', dataIndex: 'll', align: 'center',render: (rec) => {rec ?? "-"} },
- { title: '累计溢洪量(万m³)', key: 'lj', dataIndex: 'lj', align: 'center',render: (rec) => {rec ?? "-"} },
+ { title: '水位(m)', key: 'waterLevel', dataIndex: 'waterLevel', align: 'center',render: (rec) => {rec ?? "-"} },
+ { title: '库容(万m³)', key: 'boxNum', dataIndex: 'boxNum', align: 'center',render: (rec) => {rec ?? "-"} },
+ { title: '溢洪流量(m³/s)', key: 'flowNum', dataIndex: 'flowNum', align: 'center',render: (rec) => {rec ?? "-"} },
+ { title: '累计溢洪量(万m³)', key: 'qtotal', dataIndex: 'qtotal', align: 'center',render: (rec) => { rec ?? "-"} },
];
useEffect(()=>{
- getList(stcd,tms)
+ if(stcd){
+ getList(stcd,tms)
+ }
},[stcd,tms])
const getList = async (stcd,tms)=>{
const pam = {
- stm:tms[0].format('YYYY-MM-DD HH:mm:ss'),
- etm:tms[1].format('YYYY-MM-DD HH:mm:ss'),
+ dateSo:{
+ start:moment(tms[0]).format('YYYY-MM-DD HH:mm:ss'),
+ end:moment(tms[1]).format('YYYY-MM-DD HH:mm:ss'),
+ },
stcd
}
- // const res = await httppost2(apiurl)
- const list = []
- for (let i=0;i<10;i++){
- list.push({
- tm:'2023-02-07 12:'+(i+10)+':00',
- sw:i+1+'.91',
- kr:i+22+'.91',
- ll:i+15+'.91',
- lj:i+41+'.91',
- })
+ const { code, data } = await httppost2(apiurl.home.yihongList,pam)
+ if(code!==200){
+ return
}
- setList(list)
+ setList(data)
}
return (
@@ -56,7 +53,7 @@ export default function Sjcx({ data }) {
