diff --git a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js index 46d77809e..921360c4c 100644 --- a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js +++ b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js @@ -164,14 +164,20 @@ const Page = ({mySetTms}) => { onRow={ (data)=>({ onClick:()=>{ - data.data = { - "type":"MultiLineString", - "coordinates":[[ - [114.746, 31.479], - [114.776, 31.509] - ]] + // data.data = { + // "type":"MultiLineString", + // "coordinates":[ + // [ + // [114.746, 31.479], + // [114.776, 31.509] + // ] + // ] + // } + if(!data.data){ + message.error('无轨迹信息') + return } - addHlLayer(data.data,'HlItem_'+data.id,'#00FFFF',data) + addHlLayer(data?.data,'HlItem_'+data.id,'#00FFFF',data) const center = geometryCenter({type:"LineString",coordinates:data.data.coordinates[0]}); dispatch.runtime.setFeaturePop({ id: data.id, diff --git a/src/views/fxzb/hsybjs/page1/table1.js b/src/views/fxzb/hsybjs/page1/table1.js index 0c9801103..a4a20c84d 100644 --- a/src/views/fxzb/hsybjs/page1/table1.js +++ b/src/views/fxzb/hsybjs/page1/table1.js @@ -28,9 +28,16 @@ const Page = ({record}) => { return [ { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 }, { title: '时间', key: 'tm', dataIndex: 'tm', align:"center", width:180,render:v=>v.slice(0, 16)}, - { title: '预测水位', key: 'ycSwHValue', dataIndex: 'ycSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)}, + { title: '实测水位(m)', key: 'realSwHValue', dataIndex: 'realSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)}, + { title: '预测水位(m)', key: 'ycSwHValue', dataIndex: 'ycSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)}, { title: '预测入库流量', key: 'ycRkQValue', dataIndex: 'ycRkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)}, { title: '预测出库流量', key: 'ycCkQValue', dataIndex: 'ycCkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)}, + { title: '库容(万 ㎡)', key: 'nowCap', dataIndex: 'nowCap', align:"center", + render:(v,row)=>{ + const val = v===null?'-':Number(v).toFixed(2) + return
{val}{row.realSwHValue===null?
:null}
+ } + }, ]; } },[record])