From 521c2d75b021a5adb425e26518a3d63474494cbd Mon Sep 17 00:00:00 2001 From: qzc Date: Wed, 2 Apr 2025 09:38:49 +0800 Subject: [PATCH] =?UTF-8?q?qzc=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/models/_/real.js | 2 +- src/service/apiurl.js | 10 +- src/service/sssq.js | 8 +- src/views/Home/MapCtrl/Markers/ShuiKuLayer.js | 2 +- src/views/Home/MapCtrl/Markers/TuRangLayer.js | 49 ++++--- .../Home/MapCtrl/Pops/TuRang/TableData.js | 4 +- .../Home/MapCtrl/Pops/TuRang/drpOption.js | 4 +- src/views/Home/MapCtrl/Pops/TuRang/index.js | 29 ++-- src/views/Home/MapCtrl/Pops/index.js | 1 + .../Home/homePanelsLayoutPage/item_shuiku.js | 5 +- .../item_shuiku/drpOption.js | 8 +- .../homePanelsLayoutPage/item_shuiku/yhqk.js | 51 +++++-- .../item_turangshangqing.js | 37 +---- src/views/gcaqjc/bzt2/index.js | 55 +------ src/views/gcaqjc/bzt2/index.less | 136 +++++++++--------- src/views/sq/qth/sksq/index.js | 71 +-------- src/views/sq/qth/skyh/drpOption.js | 104 ++++++++------ src/views/sq/qth/skyh/index.js | 27 ++-- src/views/sq/qth/skyh/index.less | 1 + src/views/sq/qth/skyh/sjcx.js | 37 +++-- src/views/sq/qth/skyh/sssw.js | 32 +++-- src/views/sq/qth/trsq/drpOption.js | 12 +- src/views/sq/qth/trsq/index.js | 30 +--- src/views/sq/qth/trsq/index.less | 1 + src/views/sq/qth/trsq/sjcx.js | 69 +++++---- src/views/sq/qth/trsq/sssw.js | 31 ++-- .../sq/qys/gcys/projectBasicInfo/index.js | 4 +- src/views/sq/qys/gcys/xlLine/form.js | 4 +- 28 files changed, 379 insertions(+), 445 deletions(-) diff --git a/src/models/_/real.js b/src/models/_/real.js index 235203efa..5fa7bf64b 100644 --- a/src/models/_/real.js +++ b/src/models/_/real.js @@ -125,7 +125,7 @@ export const SkRealPromiseWX = new CachePromise( // }) // .catch(() => null), // 5000 - () => httppost2(apiurl.home.sk) + () => httppost2(apiurl.sssq.reservoirlist)//home.sk .then(({ data }) => data || []) .then((data) => { // if (config.notShowPOI?.hd) { diff --git a/src/service/apiurl.js b/src/service/apiurl.js index 962a6566e..e2a4b2015 100644 --- a/src/service/apiurl.js +++ b/src/service/apiurl.js @@ -96,8 +96,12 @@ const apiurl = { azd: service_fxdd + '/shpPlacement/getDetailsAndAddvcdDataList',//安置点 getqsydw: service_fxdd + '/iaCBsnssinfo/getDetailsAndAddvcdDataList',//企事业单位list getyhjmh: service_fxdd + '/iaCFlrvvlg/getDetailsAndAddvcdDataList',//沿河居民户list - turangshangqing: '', - + turangshangqing: service_fxdd + '/soilMoisture/stationList', + turangList: service_fxdd + '/soilMoisture/page', + turangCount: service_fxdd + '/soilMoisture/count/', + yihongList: service_fxdd + '/stZqrlB/flowList', + yihongCount: service_fxdd + '/stZqrlB/count/', + yihongCount24: service_fxdd + '/stZqrlB/count24/', wxqdetail: service_fxdd + '/iaCDanad/detail', anzhidian: service_fxdd + '/shpPlacement/getDetailsAndAddvcdDataList',//安置点 @@ -938,7 +942,7 @@ const apiurl = { list: service_fxdd + '/river/water/list', //实时水情-河道水情列表 warn: service_fxdd + '/current/situation/rv/warn', //实时水情-河道水情统计 summaryInfo: service_fxdd + '/river/water/summaryInfo', //实时水情-河道水情汇总 - reservoirlist: service_fxdd + '/reservoir/water/list', //实时水情-水库水情列表 + reservoirlist: service_fxdd + '/reservoir/water/listV2',//'/reservoir/water/list', //实时水情-水库水情列表 reswarn: service_fxdd + '/current/situation/res/warn', //实时水情-水库水情统计 reservoirsummaryInfo: service_fxdd + '/reservoir/water/summaryInfo', //实时水情-水库水情汇总 //河道弹框详情 diff --git a/src/service/sssq.js b/src/service/sssq.js index 021323409..dd5890691 100644 --- a/src/service/sssq.js +++ b/src/service/sssq.js @@ -25,7 +25,7 @@ export async function reservoirlist(params) { } // const list = data?.filter(o => o.lgtd && o.lttd) - return data; + return data||[]; } @@ -91,8 +91,9 @@ export async function getDetail(params) { if (code !== 200) { message.error(msg || '请求失败'); + return [] } - return data; + return data||[]; } //详情-水位流量关系 @@ -138,8 +139,9 @@ export async function reservoirmonitor(params) { if (code !== 200) { message.error(msg || '请求失败'); + return [] } - return data; + return data||[]; } //基本信息 diff --git a/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js b/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js index ef323258e..7609ba9be 100644 --- a/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js +++ b/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js @@ -94,7 +94,7 @@ export default class ShuiKuLayer extends BaseLayer { // } // }); // } - const list = [...data,sj].map((i)=>{ + const list = data.map((i)=>{ return { id : i.stcd, name: i.stnm, diff --git a/src/views/Home/MapCtrl/Markers/TuRangLayer.js b/src/views/Home/MapCtrl/Markers/TuRangLayer.js index de4fc2c81..4318aba3a 100644 --- a/src/views/Home/MapCtrl/Markers/TuRangLayer.js +++ b/src/views/Home/MapCtrl/Markers/TuRangLayer.js @@ -1,7 +1,7 @@ // import clone from "clone"; import { PicStMapDataPromise } from "../../../../models/_/real"; import apiurl from "../../../../service/apiurl"; -import { httppost2 } from "../../../../utils/request"; +import { httpget2, httppost2 } from "../../../../utils/request"; import BaseLayer from "../baselayer"; import TuRangMarker from "./TuRangMarker"; @@ -19,29 +19,32 @@ export default class TuRangLayer extends BaseLayer { } async onAdd() { - // const res = await httppost2(apiurl.home.turangshangqing) - const list = [ - { - id:'1', - stcd: '10001', - stnm: '水田站', - wd: '53', - tm: '2025-03-19 15:00:00', - lgtd: "114.7684000", - lttd: "31.4941000" - }, - { - id:'2', - stcd: '10002', - stnm: '旱田站', - wd: '21', - tm: '2025-03-19 15:00:00', - lgtd: "114.7984000", - lttd: "31.4941000" - }, - ] + const {data,code} = await httpget2(apiurl.home.turangshangqing) + if(code !== 200){ + return + } + // const list = [ + // { + // id:'1', + // stcd: '10001', + // stnm: '水田站', + // wd: '53', + // tm: '2025-03-19 15:00:00', + // lgtd: "114.7684000", + // lttd: "31.4941000" + // }, + // { + // id:'2', + // stcd: '10002', + // stnm: '旱田站', + // wd: '21', + // tm: '2025-03-19 15:00:00', + // lgtd: "114.7984000", + // lttd: "31.4941000" + // }, + // ] this._dispatch.runtime.setMarkers({ - [this.getLayerName()]: list || [] + [this.getLayerName()]: data || [] }); } diff --git a/src/views/Home/MapCtrl/Pops/TuRang/TableData.js b/src/views/Home/MapCtrl/Pops/TuRang/TableData.js index 907e07912..15f53f7ec 100644 --- a/src/views/Home/MapCtrl/Pops/TuRang/TableData.js +++ b/src/views/Home/MapCtrl/Pops/TuRang/TableData.js @@ -6,8 +6,8 @@ import moment from 'moment' const Tabledata = ({tableData}) => { const columns = [ { title: '序号', key: '', dataIndex: '', align: 'center',width:'40px',render:(a,b,c)=>c+1}, - { title: '数据时间', key: 'tm', dataIndex: 'tm', align: 'center',width:'200px',render: (rec) => {rec ?? "-"} }, - { title: '温度', key: '', dataIndex: '', align: 'center',render: (rec) => {rec ?? "-"} }, + { title: '数据时间', key: 'createTime', dataIndex: 'createTime', align: 'center',width:'200px',render: (rec) => {rec ?? "-"} }, + { title: '湿度', key: 'val', dataIndex: 'val', align: 'center',render: (rec) => {rec ?? "-"} }, ]; return ( diff --git a/src/views/Home/MapCtrl/Pops/TuRang/drpOption.js b/src/views/Home/MapCtrl/Pops/TuRang/drpOption.js index e31d1c731..bee5c5ea7 100644 --- a/src/views/Home/MapCtrl/Pops/TuRang/drpOption.js +++ b/src/views/Home/MapCtrl/Pops/TuRang/drpOption.js @@ -46,7 +46,7 @@ export default function drpOption(data,yjData) { xAxis: [ { type: 'category', - data: data.map(o => o.tm), + data: data.map(o => o.createTime), inverse: false, splitLine: { show: false @@ -150,7 +150,7 @@ export default function drpOption(data,yjData) { lineStyle: { // type: "dashed" }, - data: data.map(o => o.value), + data: data.map(o => o.val), symbol: 'none', // 设置标记点为'none'，即去掉圆点 smooth: 0.5 }, diff --git a/src/views/Home/MapCtrl/Pops/TuRang/index.js b/src/views/Home/MapCtrl/Pops/TuRang/index.js index 05dbfe8b7..5bbaa5ec4 100644 --- a/src/views/Home/MapCtrl/Pops/TuRang/index.js +++ b/src/views/Home/MapCtrl/Pops/TuRang/index.js @@ -23,19 +23,22 @@ function ShenLiu({ id, data, dispatch, onCancel }) { }; const getData = async(tms,stcd)=>{ - // const params = { - // type: 2, - // dateTimeRangeSo: { - // start: moment(tms[0]).format('YYYY-MM-DD HH:mm:ss'), - // end: moment(tms[1]).format('YYYY-MM-DD HH:mm:ss'), - // }, - // stcd - // } - // const { code, data} = await httppost2(apiurl.home.syslList,params) - // if(code!==200){ - // return - // } - setTableData([]) + const params = { + dateRangeSo: { + start: moment(tms[0]).format('YYYY-MM-DD HH:mm:ss'), + end: moment(tms[1]).format('YYYY-MM-DD HH:mm:ss'), + }, + pageSo:{ + pageSize:10, + pageNumber:1 + }, + stcd + } + const { code, data} = await httppost2(apiurl.home.turangList,params) + if(code!==200){ + return + } + setTableData(data?.records||[]) } useEffect(()=>{ diff --git a/src/views/Home/MapCtrl/Pops/index.js b/src/views/Home/MapCtrl/Pops/index.js index 7b9de1391..3d0705216 100644 --- a/src/views/Home/MapCtrl/Pops/index.js +++ b/src/views/Home/MapCtrl/Pops/index.js @@ -90,6 +90,7 @@ function FeaturePops({ mapobj }) { ) }else if (type === 'turangshangqing') { + //土壤墒情 return ( dispatch.runtime.closeFeaturePop(id)} destroyOnClose={true}> diff --git a/src/views/Home/homePanelsLayoutPage/item_shuiku.js b/src/views/Home/homePanelsLayoutPage/item_shuiku.js index 3324a96a0..454c7fd94 100644 --- a/src/views/Home/homePanelsLayoutPage/item_shuiku.js +++ b/src/views/Home/homePanelsLayoutPage/item_shuiku.js @@ -91,8 +91,7 @@ const Page = () => { const getData = async (params) => { const data1 = await reservoirlist(params) - const data2 = [...data1,sj] - setData(data2) + setData(data1) } const getShuiKu = ()=>{ @@ -144,7 +143,7 @@ const Page = () => { 溢洪情况 - + ) } diff --git a/src/views/Home/homePanelsLayoutPage/item_shuiku/drpOption.js b/src/views/Home/homePanelsLayoutPage/item_shuiku/drpOption.js index fba4b5702..ca2342b44 100644 --- a/src/views/Home/homePanelsLayoutPage/item_shuiku/drpOption.js +++ b/src/views/Home/homePanelsLayoutPage/item_shuiku/drpOption.js @@ -2,10 +2,6 @@ import echarts from 'echarts/lib/echarts'; export default function drpOption({data}) { - let arr =[] - data.forEach(item=>{ - arr.push([item.w,item.rz]) - }) return { title: { // text: "库容曲线图", @@ -34,7 +30,7 @@ export default function drpOption({data}) { // name: "流量m³/s", nameGap: 0, type: 'category', - data: data.map(o => o.bgtm), + data: data.map(o => o.tm), splitLine: { show: false }, @@ -89,7 +85,7 @@ export default function drpOption({data}) { type: 'line', name: '溢洪流量', color: "#7699f3", - data: data.map(o => o.q), + data: data.map(o => o.flowNum), // symbol: 'none' // 设置标记点为'none'，即去掉圆点 symbolSize:8, areaStyle: { diff --git a/src/views/Home/homePanelsLayoutPage/item_shuiku/yhqk.js b/src/views/Home/homePanelsLayoutPage/item_shuiku/yhqk.js index 9d08552e7..1735ea3d3 100644 --- a/src/views/Home/homePanelsLayoutPage/item_shuiku/yhqk.js +++ b/src/views/Home/homePanelsLayoutPage/item_shuiku/yhqk.js @@ -3,26 +3,49 @@ import {useDispatch, useSelector} from "react-redux"; import {Descriptions} from "antd"; import ReactEcharts from 'echarts-for-react'; import drpOption from './drpOption' -import { httppost2 } from "../../../../utils/request"; +import { httpget2, httppost2 } from "../../../../utils/request"; import apiurl from "../../../../service/apiurl"; +import moment from "moment"; -const Page = () => { +const Page = ({record}) => { const [data,setData] = useState([]) + const [count ,setCount] = useState({}) const option = useMemo(() => { return drpOption({data}); }, [data]) useEffect(()=>{ - (async()=>{ - const {data,code} = await httppost2(apiurl.dataResourcesCenter.projectAndWater.xl.list,{stcd:'61610700'}) - if(code!==200){ - return - } - setData(data) - })() - },[]) + if(record?.stcd){ + getData(record.stcd) + getCount(record.stcd) + } + },[record]) + + + const getData = async(stcd)=>{ + const pam = { + dateSo:{ + start:moment().add(-1,'month').format('YYYY-MM-DD HH:mm:ss'), + end:moment().format('YYYY-MM-DD HH:mm:ss'), + }, + stcd + } + const { code, data } = await httppost2(apiurl.home.yihongList,pam) + if(code!==200){ + return + } + setData(data) + } + + const getCount = async(stcd)=>{ + const { code, data } = await httpget2(apiurl.home.yihongCount24+stcd) + if(code!==200){ + return + } + setCount(data) + } @@ -36,10 +59,10 @@ const Page = () => {
- {103.89}m - {0.20}m³/s - {8.67}万m³ - {'06-24 09:30'} + {count.currWaterLevel}m + {count.flowNum}m³/s + {count.sum24}万 m³ + {count.createTime?.slice(5,16)}
diff --git a/src/views/Home/homePanelsLayoutPage/item_turangshangqing.js b/src/views/Home/homePanelsLayoutPage/item_turangshangqing.js index 30c36b6bc..d6ad44cf4 100644 --- a/src/views/Home/homePanelsLayoutPage/item_turangshangqing.js +++ b/src/views/Home/homePanelsLayoutPage/item_turangshangqing.js @@ -1,17 +1,16 @@ import { useEffect, useState } from "react" import {useDispatch, useSelector} from "react-redux"; import { Table, Modal, message } from 'antd'; -import { httppost2 } from '../../../utils/request'; +import { httpget2, httppost2 } from '../../../utils/request'; import apiurl from '../../../service/apiurl'; const Page = () => { const dispatch = useDispatch(); const [ tableData, setTableData ] = useState([])//在线 - const columns = [ { title: '站点', key: 'stnm', dataIndex: 'stnm',align: "center",width:80, ellipsis: true, }, - { title: '温度', key: 'wd', dataIndex: 'wd',align: "center",width:80, ellipsis: true, }, + { title: '湿度', key: 'val', dataIndex: 'val',align: "center",width:80, ellipsis: true,render:(v)=>typeof v ==='number'?v.toFixed(2):'' }, { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true }, ]; @@ -24,34 +23,12 @@ const Page = () => { },[]) const getData = async()=>{ - // const { code, data} = await httppost2(apiurl.home.turangshangqing) - // if(code!==200){ - // return - // } - const list = [ - { - id:'1', - stcd: '10001', - stnm: '水田站', - wd: '53', - tm: '2025-03-19 15:00:00', - lgtd: "114.7684000", - lttd: "31.4941000" - }, - { - id:'2', - stcd: '10002', - stnm: '旱田站', - wd: '21', - tm: '2025-03-19 15:00:00', - lgtd: "114.7984000", - lttd: "31.4941000" - }, - ] + const { code, data} = await httpget2(apiurl.home.turangshangqing) + if(code!==200){ + return + } - - - setTableData(list) + setTableData(data||[]) } diff --git a/src/views/gcaqjc/bzt2/index.js b/src/views/gcaqjc/bzt2/index.js index 7d74feb83..1690275bd 100644 --- a/src/views/gcaqjc/bzt2/index.js +++ b/src/views/gcaqjc/bzt2/index.js @@ -59,24 +59,11 @@ export default function Page({isHome}) { const getSyData = async()=>{ const {code, data} = await httpget2(apiurl.home.sy) - const list = [] - - const c = ['01','04','07','16','10','13','02','05','08','17','11','14','03','06','09','12','15','24','26','28','25','27','29','18','19','20','21','22','23'] - .map((i)=>{ - list.push({ - "stationCode": "SY"+i, - "profileName": "B0+250", - "tm": "2024-10-10 08:00:00", - "value": 195.3, - "flag": 1, - "status": 0 - }) - }) if(code!==200){ return } - setSyList(list) + setSyList(data||[]) } const getSlData = async()=>{ @@ -85,15 +72,7 @@ export default function Page({isHome}) { return } - const list = [{ - "stationCode": "SL01", - "profileName": null, - "tm": "2024-10-27 08:00:00", - "value": 1.18, - "flag": 1, - "status": 0 - }] - setSlList(list) + setSlList(data||[]) } const getWyData = async()=>{ @@ -101,35 +80,7 @@ export default function Page({isHome}) { if(code!==200){ return } - const list = [] - for(let a=1; a<33; a++){ - list.push({ - "stationCode": "WY"+(a<10?('0'+a):a), - "tm": "2024-10-15 08:00:00", - "flag": 1, - "x": -0.09, - "y": 0.1, - "h": 0.12, - "xstatus": 0, - "ystatus": 0, - "hstatus": 0 - }) - } - for(let b=1; b<37; b++){ - list.push({ - "stationCode": "ZY"+(b<10?('0'+b):b), - "tm": "2024-10-15 08:00:00", - "flag": 1, - "x": -0.09, - "y": 0.1, - "h": 0.12, - "xstatus": 0, - "ystatus": 0, - "hstatus": 0 - }) - } - - setWyList(list) + setWyList(data||[]) } const getDmData = async()=>{ diff --git a/src/views/gcaqjc/bzt2/index.less b/src/views/gcaqjc/bzt2/index.less index e01449937..91ad0b92f 100644 --- a/src/views/gcaqjc/bzt2/index.less +++ b/src/views/gcaqjc/bzt2/index.less @@ -288,280 +288,280 @@ top: 1490px; } - .gcaqjc_bzt_wy_WY01{ + .gcaqjc_bzt_wy_WY-01{ left: 961px; top: 1003px; } - .gcaqjc_bzt_wy_WY02{ + .gcaqjc_bzt_wy_WY-02{ left: 971px; top: 872px; } - .gcaqjc_bzt_wy_WY03{ + .gcaqjc_bzt_wy_WY-03{ left: 979px; top: 764px; } - .gcaqjc_bzt_wy_WY04{ + .gcaqjc_bzt_wy_WY-04{ left: 986px; top: 650px; } - .gcaqjc_bzt_wy_WY05{ + .gcaqjc_bzt_wy_WY-05{ left: 981px; top: 547px; } - .gcaqjc_bzt_wy_WY06{ + .gcaqjc_bzt_wy_WY-06{ left: 973px; top: 443px; } - .gcaqjc_bzt_wy_WY07{ + .gcaqjc_bzt_wy_WY-07{ left: 965px; top: 327px; } - .gcaqjc_bzt_wy_WY08{ + .gcaqjc_bzt_wy_WY-08{ left: 974px; top: 1004px; } - .gcaqjc_bzt_wy_WY09{ + .gcaqjc_bzt_wy_WY-09{ left: 983px; top: 876px; } - .gcaqjc_bzt_wy_WY10{ + .gcaqjc_bzt_wy_WY-10{ left: 992px; top: 766px; } - .gcaqjc_bzt_wy_WY11{ + .gcaqjc_bzt_wy_WY-11{ left: 996px; top: 656px; } - .gcaqjc_bzt_wy_WY12{ + .gcaqjc_bzt_wy_WY-12{ left: 993px; top: 546px; } - .gcaqjc_bzt_wy_WY13{ + .gcaqjc_bzt_wy_WY-13{ left: 986px; top: 436px; } - .gcaqjc_bzt_wy_WY14{ + .gcaqjc_bzt_wy_WY-14{ left: 978px; top: 325.5px; } - .gcaqjc_bzt_wy_WY15{ + .gcaqjc_bzt_wy_WY-15{ left: 1031px; top: 1009px; } - .gcaqjc_bzt_wy_WY16{ + .gcaqjc_bzt_wy_WY-16{ left: 1045px; top: 879px; } - .gcaqjc_bzt_wy_WY17{ + .gcaqjc_bzt_wy_WY-17{ left: 1049px; top: 771px; } - .gcaqjc_bzt_wy_WY18{ + .gcaqjc_bzt_wy_WY-18{ left: 1061px; top: 663px; } - .gcaqjc_bzt_wy_WY19{ + .gcaqjc_bzt_wy_WY-19{ left: 1050px; top: 543px; } - .gcaqjc_bzt_wy_WY20{ + .gcaqjc_bzt_wy_WY-20{ left: 1045px; top: 434px; } - .gcaqjc_bzt_wy_WY21{ + .gcaqjc_bzt_wy_WY-21{ left: 1037px; top: 322px; } - .gcaqjc_bzt_wy_WY22{ + .gcaqjc_bzt_wy_WY-22{ left: 1070px; top: 1012px; } - .gcaqjc_bzt_wy_WY23{ + .gcaqjc_bzt_wy_WY-23{ left: 1079px; top: 882px; } - .gcaqjc_bzt_wy_WY24{ + .gcaqjc_bzt_wy_WY-24{ left: 1088px; top: 774px; } - .gcaqjc_bzt_wy_WY25{ + .gcaqjc_bzt_wy_WY-25{ left: 1091px; top: 666px; } - .gcaqjc_bzt_wy_WY26{ + .gcaqjc_bzt_wy_WY-26{ left: 1088px; top: 542px; } - .gcaqjc_bzt_wy_WY27{ + .gcaqjc_bzt_wy_WY-27{ left: 1081px; top: 432.5px; } - .gcaqjc_bzt_wy_WY28{ + .gcaqjc_bzt_wy_WY-28{ left: 1040px; top: 20px; } - .gcaqjc_bzt_wy_WY29{ + .gcaqjc_bzt_wy_WY-29{ left: 974px; top: 95px; } - .gcaqjc_bzt_wy_WY30{ + .gcaqjc_bzt_wy_WY-30{ left: 1057px; top: 34px; } - .gcaqjc_bzt_wy_WY31{ + .gcaqjc_bzt_wy_WY-31{ left: 991px; top: 111px; } - .gcaqjc_bzt_wy_WY32{ + .gcaqjc_bzt_wy_WY-32{ left: 660px; top: 1266px; } - .gcaqjc_bzt_wy_ZY01{ + .gcaqjc_bzt_wy_ZY-01{ left: 55px; top: 1465px; } - .gcaqjc_bzt_wy_ZY02{ + .gcaqjc_bzt_wy_ZY-02{ left: 23px; top: 1455px; } - .gcaqjc_bzt_wy_ZY03{ + .gcaqjc_bzt_wy_ZY-03{ left: 48px; top: 1503px; } - .gcaqjc_bzt_wy_ZY04{ + .gcaqjc_bzt_wy_ZY-04{ left: 16px; top: 1493px; } - .gcaqjc_bzt_wy_ZY05{ + .gcaqjc_bzt_wy_ZY-05{ left: 1080px; top: 67px; } - .gcaqjc_bzt_wy_ZY06{ + .gcaqjc_bzt_wy_ZY-06{ left: 1104px; top: 98px; } - .gcaqjc_bzt_wy_ZY07{ + .gcaqjc_bzt_wy_ZY-07{ left: 1128px; top: 129px; } - .gcaqjc_bzt_wy_ZY08{ + .gcaqjc_bzt_wy_ZY-08{ left: 1151px; top: 158px; } - .gcaqjc_bzt_wy_ZY09{ + .gcaqjc_bzt_wy_ZY-09{ left: 1176px; top: 185px; } - .gcaqjc_bzt_wy_ZY10{ + .gcaqjc_bzt_wy_ZY-10{ left: 1203px; top: 208px; } - .gcaqjc_bzt_wy_ZY11{ + .gcaqjc_bzt_wy_ZY-11{ left: 1233px; top: 234px; } - .gcaqjc_bzt_wy_ZY12{ + .gcaqjc_bzt_wy_ZY-12{ left: 1259px; top: 255px; } - .gcaqjc_bzt_wy_ZY13{ + .gcaqjc_bzt_wy_ZY-13{ left: 1288px; top: 281px; } - .gcaqjc_bzt_wy_ZY14{ + .gcaqjc_bzt_wy_ZY-14{ left: 1314px; top: 304px; } - .gcaqjc_bzt_wy_ZY15{ + .gcaqjc_bzt_wy_ZY-15{ left: 1344px; top: 328px; } - .gcaqjc_bzt_wy_ZY16{ + .gcaqjc_bzt_wy_ZY-16{ left: 1026px; top: 133px; } - .gcaqjc_bzt_wy_ZY17{ + .gcaqjc_bzt_wy_ZY-17{ left: 1058px; top: 153px; } - .gcaqjc_bzt_wy_ZY18{ + .gcaqjc_bzt_wy_ZY-18{ left: 1092px; top: 172px; } - .gcaqjc_bzt_wy_ZY19{ + .gcaqjc_bzt_wy_ZY-19{ left: 1124px; top: 192px; } - .gcaqjc_bzt_wy_ZY20{ + .gcaqjc_bzt_wy_ZY-20{ left: 1152px; top: 213px; } - .gcaqjc_bzt_wy_ZY21{ + .gcaqjc_bzt_wy_ZY-21{ left: 1181px; top: 234px; } - .gcaqjc_bzt_wy_ZY22{ + .gcaqjc_bzt_wy_ZY-22{ left: 1210px; top: 259px; } - .gcaqjc_bzt_wy_ZY23{ + .gcaqjc_bzt_wy_ZY-23{ left: 1237px; top: 283px; } - .gcaqjc_bzt_wy_ZY24{ + .gcaqjc_bzt_wy_ZY-24{ left: 1266px; top: 308px; } - .gcaqjc_bzt_wy_ZY25{ + .gcaqjc_bzt_wy_ZY-25{ left: 1292px; top: 330px; } - .gcaqjc_bzt_wy_ZY26{ + .gcaqjc_bzt_wy_ZY-26{ left: 1320px; top: 354px; } - .gcaqjc_bzt_wy_ZY27{ + .gcaqjc_bzt_wy_ZY-27{ left: 1213px; top: 198px; } - .gcaqjc_bzt_wy_ZY28{ + .gcaqjc_bzt_wy_ZY-28{ left: 1242px; top: 224px; } - .gcaqjc_bzt_wy_ZY29{ + .gcaqjc_bzt_wy_ZY-29{ left: 1268px; top: 245px; } - .gcaqjc_bzt_wy_ZY30{ + .gcaqjc_bzt_wy_ZY-30{ left: 1297px; top: 271px; } - .gcaqjc_bzt_wy_ZY31{ + .gcaqjc_bzt_wy_ZY-31{ left: 1324px; top: 293px; } - .gcaqjc_bzt_wy_ZY32{ + .gcaqjc_bzt_wy_ZY-32{ left: 1251px; top: 213px; } - .gcaqjc_bzt_wy_ZY33{ + .gcaqjc_bzt_wy_ZY-33{ left: 1277px; top: 234px; } - .gcaqjc_bzt_wy_ZY34{ + .gcaqjc_bzt_wy_ZY-34{ left: 1307px; top: 259px; } - .gcaqjc_bzt_wy_ZY35{ + .gcaqjc_bzt_wy_ZY-35{ left: 1261px; top: 202px; } - .gcaqjc_bzt_wy_ZY36{ + .gcaqjc_bzt_wy_ZY-36{ left: 1289px; top: 219px; } diff --git a/src/views/sq/qth/sksq/index.js b/src/views/sq/qth/sksq/index.js index 5ea3398ab..15bab8363 100644 --- a/src/views/sq/qth/sksq/index.js +++ b/src/views/sq/qth/sksq/index.js @@ -8,72 +8,7 @@ import { helpers } from '@turf/turf'; import { Label } from 'react-konva'; -const sj = { - "stcd": "61610701", - "stnm": "檀树岗2", - "rvnm": "檀树岗河", - "hnnm": "长江中游下段北岸", - "bsnm": "长江", - "lgtd": "114.744317000", - "lttd": "31.505000000", - "stlc": "黄冈市红安县七里镇檀树岗村", - "alt": null, - "mdbz": null, - "mdpr": null, - "dtmnm": "吴淞", - "dtmel": null, - "dtpr": "0.000", - "sttp": "RR", - "dfrtms": null, - "fritm": null, - "frgrd": "3", - "esstym": "197103", - "bgfrym": "197103", - "edfrym": null, - "atcunit": "黄冈市水利和湖泊局", - "admauth": "黄冈水文", - "locality": "湖北水文", - "stbk": null, - "stazt": null, - "dstrvm": null, - "drna": "78", - "phcd": "TSG", - "usfl": "1", - "comments": "中小河流改造", - "moditime": "2022-02-23 00:00:00", - "remGd": null, - "ogid": null, - "vlfl": null, - "atid": null, - "sdfl": null, - "rma": null, - "mdps": null, - "mddt": null, - "stindex": null, - "starea": null, - "stlevel": null, - "code": null, - "ispbj": null, - "issxst": null, - "stpq": null, - "sthday": null, - "source": "SW", - "importancy": 0, - "clgtd": "114.744317000", - "clttd": "31.505000000", - "elev": null, - "crucial": 0, - "buildYear": null, - "adcd": null, - "lyid": null, - "resCode": "42120250085", - "rvCode": null, - "status": 1, - "agreement": null, - "simCard": null, - "bdCard": null, - "v": 104.1 -} + export default function Sksq() { @@ -81,8 +16,8 @@ export default function Sksq() { const [selected, setSelected] = useState(0) const getData = async (params) => { - const data = await await reservoirlist(params) - setTableData([...data,sj]); + const data = await reservoirlist(params) + setTableData(data); } useEffect(() => { let option = { diff --git a/src/views/sq/qth/skyh/drpOption.js b/src/views/sq/qth/skyh/drpOption.js index 5e6af8e57..b4f911572 100644 --- a/src/views/sq/qth/skyh/drpOption.js +++ b/src/views/sq/qth/skyh/drpOption.js @@ -1,4 +1,4 @@ -export default function drpOption(data,yjData) { +export default function drpOption(data,records) { console.log("data",data); // const maxVal = 0//Math.max(...data.map(obj => obj.drp)) // const max1 = Math.max(...[...data.map(obj => obj.value),...yjData?.map(obj => obj.value)]) @@ -28,26 +28,26 @@ export default function drpOption(data,yjData) { }, grid: [ { - top: "12%", - left: "10%", + top: "7%", + left: "15%", right: "8%", - width: '80%', - height: '35%' + width: '83%', + height: '40%' }, { bottom: '5%', left: '10%', right: '8%', - width: '80%', - height: '35%' + width: '82%', + height: '38%' } ], legend: { - top:'3%', + top:'1%', // 显示图例 show: true, // 图例的位置 - data: ["库容","水位","汛限水位","设计水位","校核水位","溢洪流量"], + data: ["溢洪流量","校核水位","设计水位","汛限水位","水位", "库容"], }, xAxis: [ { @@ -120,7 +120,7 @@ export default function drpOption(data,yjData) { axisLabel: { color: '#8c8c8c', fontSize: 12, - formatter: val => val+'%' + formatter: val => val+'m³/s' }, axisLine: { show: false @@ -176,13 +176,13 @@ export default function drpOption(data,yjData) { splitLine: { show: false, lineStyle: { - color: '#07a6ff', - width: 0.25, + color: '#bfbfbf', + width: 0.5, type: 'dotted' } }, axisLabel: { - color: '#333', + color: '#8c8c8c', fontSize: 12, }, axisLine: { @@ -199,8 +199,10 @@ export default function drpOption(data,yjData) { name: '溢洪流量', type: 'line', color: "#3478f4", - data: data.map(o => o.kr), - // symbol: 'none', // 设置标记点为'none'，即去掉圆点 + itemStyle: { + color: '#678ef2', + borderWidth: '0.3' + }, symbolSize:8, areaStyle: { // 开启阴影 @@ -210,51 +212,59 @@ export default function drpOption(data,yjData) { shadowOffsetY: 5, // 阴影垂直方向上的偏移 opacity: 0.3 // 区域颜色的透明度 }, + data: data.map(o => o.flowNum), + // symbol: 'none', // 设置标记点为'none'，即去掉圆点 }, { + xAxisIndex: 1, + yAxisIndex: 1, + name: '校核水位', + type: 'line', + color: "#da2f2d", + symbol: 'none', // 设置标记点为'none'，即去掉圆点 + data: data.map(o => records.calFloodLev), + // symbol: 'none', // 设置标记点为'none'，即去掉圆点 + }, + { + xAxisIndex: 1, + yAxisIndex: 1, + name: '设计水位', + type: 'line', + color: "#e89e42", + symbol: 'none', // 设置标记点为'none'，即去掉圆点 + data: data.map(o => records.desFloodLev), + // symbol: 'none', // 设置标记点为'none'，即去掉圆点 + }, + { + xAxisIndex: 1, + yAxisIndex: 1, + name: '汛限水位', + type: 'line', + color: "#f8dda7", + symbol: 'none', // 设置标记点为'none'，即去掉圆点 + data: data.map(o => records.flLowLimLev), + // symbol: 'none', // 设置标记点为'none'，即去掉圆点 + }, + { + xAxisIndex: 1, + yAxisIndex: 1, xAxisIndex: 1, yAxisIndex: 1, name: '水位', type: 'line', color: "#67ddb7", symbol: 'none', // 设置标记点为'none'，即去掉圆点 - data: data.map(o => o.sw), + data: data.map(o => o.waterLevel), // symbol: 'none', // 设置标记点为'none'，即去掉圆点 }, { - name: '汛限水位', + xAxisIndex: 1, + yAxisIndex: 2, + name: '库容', type: 'line', - color: "#f8dda7", + color: "#3478f4", + data: data.map(o => o.boxNum), symbol: 'none', // 设置标记点为'none'，即去掉圆点 - data: data.map(o => 130), - // symbol: 'none', // 设置标记点为'none'，即去掉圆点 - }, - { - name: '设计水位', - type: 'line', - color: "#e89e42", - symbol: 'none', // 设置标记点为'none'，即去掉圆点 - data: data.map(o => 100), - // symbol: 'none', // 设置标记点为'none'，即去掉圆点 - }, - { - name: '校核水位', - type: 'line', - color: "#da2f2d", - symbol: 'none', // 设置标记点为'none'，即去掉圆点 - data: data.map(o => 160), - // symbol: 'none', // 设置标记点为'none'，即去掉圆点 - }, - { - name: '溢洪流量', - type: 'bar', - barWidth: '20%', - itemStyle: { - color: '#678ef2', - borderWidth: '0.3' - }, - data: data.map(o => o.ll), - // symbol: 'none', // 设置标记点为'none'，即去掉圆点 }, ] }; diff --git a/src/views/sq/qth/skyh/index.js b/src/views/sq/qth/skyh/index.js index d40abebdc..f51b342bf 100644 --- a/src/views/sq/qth/skyh/index.js +++ b/src/views/sq/qth/skyh/index.js @@ -11,11 +11,16 @@ import { helpers } from '@turf/turf'; import NormalSelect from '../../../../components/Form/NormalSelect'; export default function Sksq() { const [selectList, setSelectList] = useState([]) - // const [selected, setSelected] = useState(0) + const [selected, setSelected] = useState(0) const getList = async() => { try { const data = await reservoirlist() - setSelectList(data) + const list = data?.map((item,index)=>({ + label:item.stnm, + value:index, + data:item + })) + setSelectList(list) } catch (error) { console.log(error); } @@ -26,7 +31,7 @@ export default function Sksq() { useEffect(() => { getList() }, []) - + return (
@@ -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 }) {
{ - // const res = await httppost2(apiurlhome.turangshangqing.{stcd}) - // setDetail{res} + const {code, data} = await httpget2(apiurl.home.yihongCount+stcd) + if(code!==200){ + return + } + setDetail(data) } useEffect(() => { if (data.stcd) { getDetail(data.stcd) } }, [data]) + + const getVal = (v)=>{ + if(typeof v === 'number'){ + return v.toFixed(2) + }else{ + return '-' + } + } return (
@@ -20,32 +31,31 @@ export default function Sssw({ data }) {
数据更新时间: {detail?.tm}
+ >数据更新时间: {detail?.createTime}
-
{detail?.h ?? '-' } m³/s
+
{getVal(detail?.val) ?? '-' } m³/s
溢洪流量
-
{detail?.h3 ?? '-' } 万m³
+
{getVal(detail?.currDayValSum) ?? '-' } 万m³
当日溢洪量
-
{detail?.h6 ?? '-' } 万m³
+
{getVal(detail?.currMonthSum) ?? '-' } 万m³
当月溢洪量
-
{detail?.h12 ?? '-' } 万m³
+
{getVal(detail?.currYearSum) ?? '-' } 万m³
当年溢洪量
-
{detail?.h24 ?? '-' } 次
+
{getVal(detail?.currYearCount) ?? '-' } 次
本年溢洪次数
-
{detail?.h48 ?? '-' } 万m³
+
{getVal(detail?.currYearMaxVal) ?? '-' } 万m³
本年单次最大溢洪量
-
diff --git a/src/views/sq/qth/trsq/drpOption.js b/src/views/sq/qth/trsq/drpOption.js index 08bd03a07..0595e3980 100644 --- a/src/views/sq/qth/trsq/drpOption.js +++ b/src/views/sq/qth/trsq/drpOption.js @@ -30,10 +30,10 @@ export default function drpOption(data,yjData) { grid: [ { top: "12%", - left: "10%", - right: "8%", - width: '80%', - height: '75%' + left: "8%", + right: "1%", + width: '90%', + height: '80%' }, ], legend: { @@ -46,7 +46,7 @@ export default function drpOption(data,yjData) { xAxis: [ { type: 'category', - data: data.map(o => o.tm), + data: data.map(o => o.createTime), inverse: false, splitLine: { show: false @@ -149,7 +149,7 @@ export default function drpOption(data,yjData) { lineStyle: { // type: "dashed" }, - data: data.map(o => o.sd), + data: data.map(o => o.val), symbol: 'none', // 设置标记点为'none'，即去掉圆点 smooth: 0.5 }, diff --git a/src/views/sq/qth/trsq/index.js b/src/views/sq/qth/trsq/index.js index 9cb2bd6ea..7f995db7a 100644 --- a/src/views/sq/qth/trsq/index.js +++ b/src/views/sq/qth/trsq/index.js @@ -5,7 +5,7 @@ import Sssw from './sssw'; // import Sjcx from '../../../Home/MapCtrl/components/Jcsj/index' import Sjcx from './sjcx' import "./index.less" -import { httppost2 } from '../../../../utils/request'; +import { httpget2, httppost2 } from '../../../../utils/request'; import apiurl from '../../../../service/apiurl'; import { helpers } from '@turf/turf'; import NormalSelect from '../../../../components/Form/NormalSelect'; @@ -29,28 +29,12 @@ export default function Sksq() { const [selected, setSelected] = useState(0) const getList = async() => { try { - // const res = await httppost2(apiurl.home.turangshangqing) - const res = [ - { - id:'1', - stcd: '10001', - stnm: '水田站', - wd: '53', - tm: '2025-03-19 15:00:00', - lgtd: "114.7684000", - lttd: "31.4941000" - }, - { - id:'2', - stcd: '10002', - stnm: '旱田站', - wd: '21', - tm: '2025-03-19 15:00:00', - lgtd: "114.7984000", - lttd: "31.4941000" - }, - ] - const list = res?.map((item,index)=>({ + const {code, data} = await httpget2(apiurl.home.turangshangqing) + if(code!==200){ + return + } + + const list = data?.map((item,index)=>({ label:item.stnm, value:index, data:item diff --git a/src/views/sq/qth/trsq/index.less b/src/views/sq/qth/trsq/index.less index e58ac27a8..e183ed109 100644 --- a/src/views/sq/qth/trsq/index.less +++ b/src/views/sq/qth/trsq/index.less @@ -86,6 +86,7 @@ padding: 0 10px; display: flex; flex-direction: row; + // min-height: 600px; .qth_trsq_sjcx_center_left{ width: 45%; margin-bottom: 10px; diff --git a/src/views/sq/qth/trsq/sjcx.js b/src/views/sq/qth/trsq/sjcx.js index 493f24f19..ae34cf2af 100644 --- a/src/views/sq/qth/trsq/sjcx.js +++ b/src/views/sq/qth/trsq/sjcx.js @@ -2,7 +2,7 @@ import React,{useState,useEffect, useMemo} from 'react' import {Table} from 'antd'; import ReactEcharts from 'echarts-for-react'; import {queryStPptnDetails} from '../../../../service/ssyq' -import { httppost2 } from '../../../../utils/request' +import { httpget2, httppost2 } from '../../../../utils/request' import apiurl from '../../../../service/apiurl' import moment from 'moment'; import Toolbar from './toolbar' @@ -16,8 +16,8 @@ export default function Sjcx({ data }) { const option = useMemo(() => drpOption(list), [list]) const columns = [ { title: '序号', key: '', dataIndex: '', align: 'center',width:'80px',render:(a,b,c)=>c+1}, - { title: '数据时间', key: 'tm', dataIndex: 'tm', align: 'center',width:'200px',render: (rec) => {rec ?? "-"} }, - { title: '湿度', key: 'sd', dataIndex: 'sd', align: 'center',render: (rec) => {rec ?? "-"} }, + { title: '数据时间', key: 'createTime', dataIndex: 'createTime', align: 'center',width:'200px',render: (rec) => {rec ?? "-"} }, + { title: '湿度', key: 'val', dataIndex: 'val', align: 'center',render: (rec) => {rec ?? "-"} }, ]; @@ -29,26 +29,45 @@ export default function Sjcx({ data }) { },[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'), + const params = { + dateRangeSo: { + start: moment(tms[0]).format('YYYY-MM-DD HH:mm:ss'), + end: moment(tms[1]).format('YYYY-MM-DD HH:mm:ss'), + }, + pageSo:{ + pageSize:10, + pageNumber:1 + }, stcd } - // const res = await httppost2(apiurl) - const list = [] - for (let i=0;i<30;i++){ - list.push({ - tm:'2023-02-07 12:'+(i+10)+':00', - sd:i+7+'.91' - }) + const { code, data} = await httppost2(apiurl.home.turangList,params) + if(code!==200){ + return } - setList(list) + // const list = [] + // for (let i=0;i<30;i++){ + // list.push({ + // tm:'2023-02-07 12:'+(i+10)+':00', + // sd:i+7+'.91' + // }) + // } + setList(data?.records||[]) } const getCount = async (stcd)=>{ - // const res = await httppost2(apiurl) - setCountObj({}) + const {code, data} = await httpget2(apiurl.home.turangCount+stcd) + if(code!==200){ + return + } + setCountObj(data) } + const getVal = (v)=>{ + if(typeof v === 'number'){ + return v.toFixed(2) + }else{ + return '-' + } + } return (
@@ -68,7 +87,7 @@ export default function Sjcx({ data }) {
{ list.length>0? - + :
}
@@ -77,37 +96,37 @@ export default function Sjcx({ data }) {
本周(极值,RH)
-
{countObj?.h1||0}
+
{getVal(countObj?.currWeekValMax)+'/'+getVal(countObj?.currWeekValMin)||0}
本月(极值,RH)
-
{countObj?.h3||0}
+
{getVal(countObj?.currMonthValMax)+'/'+getVal(countObj?.currMonthValMin)||0}
本年(极值,RH)
-
{countObj?.h6||0}
+
{getVal(countObj?.currYearValMax)+'/'+getVal(countObj?.currYearValMin)||0}
近1周(极值,RH)
-
{countObj?.h12||0}
+
{getVal(countObj?.nearWeekValMax)+'/'+getVal(countObj?.nearWeekValMin)||0}
近1月(极值,RH)
-
{countObj?.yearDrpDay}/{countObj?.C}
+
{getVal(countObj?.nearMonthValMax)+'/'+getVal(countObj?.nearMonthValMin)||0}
近3月(极值,RH)
-
{countObj.today}
+
{getVal(countObj?.nearThreeMonthValMax)+'/'+getVal(countObj?.nearThreeMonthValMin)||0}
近6月(极值,RH)
-
{countObj?.yesterdayDrp}
+
{getVal(countObj?.nearSixMonthValMax)+'/'+getVal(countObj?.nearSixMonthValMin)||0}
近1年(极值,RH)
-
{countObj?.monthDrp}
+
{getVal(countObj?.nearYearValMax)+'/'+getVal(countObj?.nearYearValMin)||0}
 
diff --git a/src/views/sq/qth/trsq/sssw.js b/src/views/sq/qth/trsq/sssw.js index 428e99585..5aed53545 100644 --- a/src/views/sq/qth/trsq/sssw.js +++ b/src/views/sq/qth/trsq/sssw.js @@ -1,12 +1,15 @@ import React,{useState,useEffect} from 'react' import {queryStPptnDetails} from '../../../../service/ssyq' -import { httppost2 } from '../../../../utils/request' +import { httpget2, httppost2 } from '../../../../utils/request' import apiurl from '../../../../service/apiurl' export default function Sssw({ data }) { const [detail, setDetail] = useState({}) const getDetail = async (stcd) => { - // const res = await httppost2(apiurlhome.turangshangqing.{stcd}) - // setDetail{res} + const {code, data} = await httpget2(apiurl.home.turangCount+stcd) + if(code!==200){ + return + } + setDetail(data) } useEffect(() => { if (data.stcd) { @@ -14,35 +17,43 @@ export default function Sssw({ data }) { } }, [data]) + const getVal = (v)=>{ + if(typeof v === 'number'){ + return v.toFixed(2) + }else{ + return '-' + } + } + return (
墒情最新上报时间: {detail?.tm}
+ >墒情最新上报时间: {detail?.createTime}
-
{detail?.h ?? '-' }% RH
+
{getVal(detail?.currVal) ?? '-' }% RH
实时数据
-
{detail?.h3 ?? '-' }% RH
+
{getVal(detail?.nearWeekValMax)+'/'+getVal(detail?.nearWeekValMin) ?? '-' }% RH
近1周（极值）
-
{detail?.h6 ?? '-' }% RH
+
{getVal(detail?.nearMonthValMax)+'/'+getVal(detail.nearMonthValMin) ?? '-' }% RH
近1月（极值）
-
{detail?.h12 ?? '-' }% RH
+
{getVal(detail?.nearThreeMonthValMax)+'/'+getVal(detail.nearThreeMonthValMin) ?? '-' }% RH
近3月（极值）
-
{detail?.h24 ?? '-' }% RH
+
{getVal(detail?.nearSixMonthValMax)+'/'+getVal(detail.nearSixMonthValMin) ?? '-' }% RH
近6月（极值）
-
{detail?.h48 ?? '-' }% RH
+
{getVal(detail?.nearYearValMax)+'/'+getVal(detail.nearYearValMin) ?? '-' }% RH
近1年（极值）
diff --git a/src/views/sq/qys/gcys/projectBasicInfo/index.js b/src/views/sq/qys/gcys/projectBasicInfo/index.js index 25dba9862..2894cad99 100644 --- a/src/views/sq/qys/gcys/projectBasicInfo/index.js +++ b/src/views/sq/qys/gcys/projectBasicInfo/index.js @@ -455,7 +455,9 @@ export default function ProjectBasciInfo() { { skdisabled ? :
- +
} diff --git a/src/views/sq/qys/gcys/xlLine/form.js b/src/views/sq/qys/gcys/xlLine/form.js index 6f8bfd502..10232e7bd 100644 --- a/src/views/sq/qys/gcys/xlLine/form.js +++ b/src/views/sq/qys/gcys/xlLine/form.js @@ -34,7 +34,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => {
{