lishenfeng
/
mcfxkh-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lsf-dev'

lsf-dev
李神峰 2025-06-13 10:29:59 +08:00
parent a1fd78d9c8 502760e2fd
commit bcdfb529c4
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/Home/panels/HDReal/index.js
View File

@ -136,8 +136,8 @@ function HDReal({ style }) {
}
extra={
<>
<i style={{ marginRight: '0.5rem', color: hdAutoRefresh ? '#00deff' : '#aaa' }} className="ionicons loop cursor-pointer" onClick={toggleAutoRefresh}></i>
<i className="ionicons gear cursor-pointer" onClick={() => showSetting(true)}></i>
{/* <i style={{ marginRight: '0.5rem', color: hdAutoRefresh ? '#00deff' : '#aaa' }} className="ionicons loop cursor-pointer" onClick={toggleAutoRefresh}></i>
<i className="ionicons gear cursor-pointer" onClick={() => showSetting(true)}></i> */}
</>
}
>
@ -147,8 +147,8 @@ function HDReal({ style }) {
<TableRow>
<DpTableCell style={{ maxWidth: '30%' }} align="left">名称</DpTableCell>
<DpTableCell align="right">水位</DpTableCell>
<DpTableCell align="right">保证水位</DpTableCell>
<DpTableCell align="right">警戒水位</DpTableCell>
<DpTableCell align="right">保证水位(m)</DpTableCell>
<DpTableCell align="right">警戒水位(m)</DpTableCell>
</TableRow>
</TableHead>
<TableBody>
@ -157,7 +157,7 @@ function HDReal({ style }) {
<DpTableCell component="th" scope="row">
<div className="table-ellipsis cursor-pointer">{row.stnm}</div>
</DpTableCell>
<DpTableCell align="right">{renderHDRz(row)}</DpTableCell>
<DpTableCell align="right">{renderHDRz(row)}{row.stnm == '浮桥河'? '↑':""}</DpTableCell>
{rzRender(row.rz, row.rz+5.5)}
{rzRender(row.rz, row.rz+4)}
</DpTableRow>

2
src/views/Home/panels/RainSta/index.js
View File

@ -249,7 +249,7 @@ export default function Overall({ style }) {
<TableRow onClick={() =>flyTo(item)}>
<DpTableCell style={{ width: '53%' }}>{item.stnm}</DpTableCell>
<DpTableCell style={{ width: timeRange == '1h' ?'27%':"30%" }}>{item.today}</DpTableCell>
<DpTableCell style={{ width: timeRange == '1h' ?'20%':'17%' }}>{timeRange == '1h' ? '乘马岗镇':'浮桥河'}</DpTableCell>
<DpTableCell style={{ width: timeRange == '1h' ?'20%':'17%' }}>{timeRange == '1h' ? '福田河镇':'福田河'}</DpTableCell>
</TableRow>
))
}

14
src/views/Home/panels/SkReal/index.js
View File

@ -138,7 +138,7 @@ const setSkLayer = (data = []) => {
color="green"
extra={
<>
<i style={{ marginRight: '0.5rem', color: skAutoRefresh ? '#00deff' : '#aaa' }} className="ionicons loop cursor-pointer" onClick={toggleAutoRefresh}></i>
{/* <i style={{ marginRight: '0.5rem', color: skAutoRefresh ? '#00deff' : '#aaa' }} className="ionicons loop cursor-pointer" onClick={toggleAutoRefresh}></i> */}
{/* <i style={{ marginRight: '0.5rem' }} className="ionicons image cursor-pointer" onClick={handleOpen}></i> */}
{/* <i className="ionicons gear cursor-pointer" onClick={() => showSetting(true)}></i> */}
</>
@ -148,19 +148,19 @@ const setSkLayer = (data = []) => {
<Table size="small" stickyHeader>
<TableHead>
<TableRow>
<DpTableCell style={{ maxWidth: '30%' }} align="left">名称</DpTableCell>
<DpTableCell style={{ minWidth: '6rem' }} align="right">{appconsts.drpTtype[tableSkDrpField]}降雨</DpTableCell>
<DpTableCell style={{ minWidth: '3rem' }} align="right">水位</DpTableCell>
<DpTableCell style={{ minWidth: '4rem' }} align="right">超汛限</DpTableCell>
<DpTableCell style={{ minWidth: '6rem' }} align="left">名称</DpTableCell>
<DpTableCell style={{ minWidth: '8rem' }} align="center">{appconsts.drpTtype[tableSkDrpField]}降雨(mm)</DpTableCell>
<DpTableCell style={{ minWidth: '3rem' }} align="right">水位(m)</DpTableCell>
<DpTableCell style={{ minWidth: '6rem' }} align="right">超汛限(m)</DpTableCell>
</TableRow>
</TableHead>
<TableBody>
{[...sortedData.filter(o=>o.rzState===1),...sortedData.filter(o=>o.rzState!==1)].map((row) => (
{[...sortedData.filter(o=>o.rzState===1)].map((row) => (
<DpTableRow key={row.stcd} onClick={() => { flyTo(row); setSkLayer([row]) }}>
<DpTableCell component="th" scope="row">
<div className="table-ellipsis cursor-pointer" >{row.rzState===1?row.stnm:row.stnm+'(离线)'}</div>
</DpTableCell>
<DpTableCell align="right">{row['h24']}</DpTableCell>
<DpTableCell align="center">{row['h24']}</DpTableCell>
<DpTableCell align="right">{row?.rz}</DpTableCell>
<DpTableCell align="right">{renderSkArz(row)}</DpTableCell>
</DpTableRow>