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

Merge branch 'qzc-dev'

lsf-dev
秦子超 2025-06-23 17:14:20 +08:00
parent abe746c245 b6ddee139c
commit e82f3930b8
12 changed files with 198 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/assets/13331750669157_.pic.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 177 KiB

BIN
public/assets/13341750669367_.pic.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 177 KiB

8
public/data3/skReal.json
View File

@ -1923,14 +1923,14 @@
"h12": 4,
"h24": 4,
"h48": 4,
"drpState": 1,
"rz": 60.7,
"drpState": 2,
"rz": 65.7,
"w": 45490,
"xs":32133,
"a_fsltdz": -4.189999999999998,
"rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 0,
"rzState": 1,
"rzWarning": 1,
"rzState": 2,
"layer": "RealSkLayer",
"layerPop": "RealSkPop"
},

64
src/views/Home/InfoDlg/AllSkDlg/index.js
View File

@ -14,52 +14,40 @@ function HDStDlg({ record, onClose }) {
const dispatch = useDispatch();
const data = {
"stcd": "716129061",
"stcd": "61614200",
"type": "sk",
"hasRz": true,
"stnm": "仰天窝水库",
"adcd": "421181201000",
"stnm": "浮桥河水库",
"adcd": "421181100000",
"wscd": null,
"importancy": 0,
"lgtd": 115.106667,
"lttd": 31.126389,
"lgtd": 114.88069,
"lttd": 31.171967,
"elev": 0,
"damel": 325.08,
"dsflz": 324.18,
"fsltdz": 323.5,
"ddz": 319.5,
"zcxsw": 323.5,
"drpTm": "2025-04-11T05:00:00.000Z",
"today": 0,
"h1": 0,
"h3": 0,
"h6": 0,
"h12": 0,
"h24": 0,
"h48": 0,
"damel": 71.33,
"dsflz": 68.04,
"fsltdz": 64.89,
"ddz": 51.78,
"zcxsw": 64.89,
"jhhsw":68.7,
"drpTm": "2025-06-06T22:00:00.000Z",
"today": 4,
"h1": 4,
"h3": 4,
"h6": 4,
"h12": 4,
"h24": 4,
"h48": 4,
"drpState": 2,
"rz": 325.16,
"w": 0.132,
"a_fsltdz": 4.660000000000025,
"rzTm": "2025-04-11T05:00:00.000Z",
"rz": 65.7,
"w": 45490,
"xs":32133,
"a_fsltdz": -4.189999999999998,
"rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 1,
"rzState": 2,
"pic": [
{
"stcd": "716129061",
"tm": "2023-03-12T06:05:00.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129061/20230312140500.jpg"
},
{
"stcd": "716129061",
"tm": "2023-03-12T07:25:00.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129062/20230312152500.jpg"
}
],
"layer": "RealSkLayer",
"layerPop": "RealSkPop",
"aRz": 4.66,
"strarz": "4.66"
"layerPop": "RealSkPop"
}
const flyTo = (row) => {
@ -95,7 +83,7 @@ function HDStDlg({ record, onClose }) {
<DpCloseButton onClick={onClose} />
</DpAppBar>
<div style={{position:'relative'}}>
<img src={process.env.PUBLIC_URL+'/assets/13291750658674_.pic.jpg'} style={{width:'100%',marginTop:'0rem'}}/>
<img src={process.env.PUBLIC_URL+'/assets/13341750669367_.pic.jpg'} style={{width:'100%',marginTop:'0rem'}}/>
<div style={{position:'absolute',width:'4rem',height:'20px',background:'transparent',top:'9rem',left:'8rem',cursor:'pointer',zIndex:999}}
onClick={()=>flyTo(data)}
></div>

7
src/views/Home/InfoPops/RealSkPop/index.js
View File

@ -195,6 +195,13 @@ function RealSkTip({ record, dispatch,view }) {
进入三维模块
</span>:null
}
{
(record.stnm == '浮桥河水库' && view===8)?
<span style={{cursor:'pointer',color:'#50b1f9',marginLeft:20}} onClick={()=>{
dispatch.map.setView(205)
}}> 进入防汛调度</span>:null
}
</div>
<div className="extra cursor-pointer" onClick={viewInfo}>详细</div>
</div>

80
src/views/Home/MapCtrl/mapstyle/realsklayerQ2.js
View File

@ -74,51 +74,41 @@ export default class RealSkLayerQ2 extends BaseLayer {
const ms = mapCtrl.getSource(SourceName);
let data = [{
"stcd": "716129061",
"type": "sk",
"hasRz": true,
"stnm": "仰天窝水库",
"adcd": "421181201000",
"wscd": null,
"importancy": 0,
"lgtd": 115.106667,
"lttd": 31.126389,
"elev": 0,
"damel": 325.08,
"dsflz": 324.18,
"fsltdz": 323.5,
"ddz": 319.5,
"zcxsw": 323.5,
"drpTm": "2025-04-11T05:00:00.000Z",
"today": 0,
"h1": 0,
"h3": 0,
"h6": 0,
"h12": 0,
"h24": 0,
"h48": 0,
"drpState": 2,
"rz": 325.16,
"w": 0.132,
"a_fsltdz": 4.660000000000025,
"rzTm": "2025-04-11T05:00:00.000Z",
"rzWarning": 1,
"rzState": 2,
"pic": [
{
"stcd": "716129061",
"tm": "2023-03-12T06:05:00.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129061/20230312140500.jpg"
},
{
"stcd": "716129061",
"tm": "2023-03-12T07:25:00.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129062/20230312152500.jpg"
}
],
"aRz": 4.66,
"strarz": "4.66"
}];
"stcd": "61614200",
"type": "sk",
"hasRz": true,
"stnm": "浮桥河水库",
"adcd": "421181100000",
"wscd": null,
"importancy": 0,
"lgtd": 114.88069,
"lttd": 31.171967,
"elev": 0,
"damel": 71.33,
"dsflz": 68.04,
"fsltdz": 64.89,
"ddz": 51.78,
"zcxsw": 64.89,
"jhhsw":68.7,
"drpTm": "2025-06-06T22:00:00.000Z",
"today": 4,
"h1": 4,
"h3": 4,
"h6": 4,
"h12": 4,
"h24": 4,
"h48": 4,
"drpState": 2,
"rz": 65.7,
"w": 45490,
"xs":32133,
"a_fsltdz": -4.189999999999998,
"rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 1,
"rzState": 2,
"layer": "RealSkLayer",
"layerPop": "RealSkPop"
}];
if (Array.isArray(data)) {
data.forEach(o => {
const strarz = o.rz - o.fsltdz;

64
src/views/Home/panels/Cxsk/ARzSk.js
View File

@ -40,52 +40,40 @@ function Item({ data, viewInfo, sendMessage }) {
function ARzSk({data}) {
data = [{
"stcd": "716129061",
"stcd": "61614200",
"type": "sk",
"hasRz": true,
"stnm": "仰天窝水库",
"adcd": "421181201000",
"stnm": "浮桥河水库",
"adcd": "421181100000",
"wscd": null,
"importancy": 0,
"lgtd": 115.106667,
"lttd": 31.126389,
"lgtd": 114.88069,
"lttd": 31.171967,
"elev": 0,
"damel": 325.08,
"dsflz": 324.18,
"fsltdz": 323.5,
"ddz": 319.5,
"zcxsw": 323.5,
"drpTm": "2025-04-11T05:00:00.000Z",
"today": 0,
"h1": 0,
"h3": 0,
"h6": 0,
"h12": 0,
"h24": 0,
"h48": 0,
"damel": 71.33,
"dsflz": 68.04,
"fsltdz": 64.89,
"ddz": 51.78,
"zcxsw": 64.89,
"jhhsw":68.7,
"drpTm": "2025-06-06T22:00:00.000Z",
"today": 4,
"h1": 4,
"h3": 4,
"h6": 4,
"h12": 4,
"h24": 4,
"h48": 4,
"drpState": 2,
"rz": 325.16,
"w": 0.132,
"a_fsltdz": 4.660000000000025,
"rzTm": "2025-04-11T05:00:00.000Z",
"rz": 65.7,
"w": 45490,
"xs":32133,
"a_fsltdz": -4.189999999999998,
"rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 1,
"rzState": 2,
"pic": [
{
"stcd": "716129061",
"tm": "2023-03-12T06:05:00.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129061/20230312140500.jpg"
},
{
"stcd": "716129061",
"tm": "2023-03-12T07:25:00.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129062/20230312152500.jpg"
}
],
"layer": "RealSkLayer",
"layerPop": "RealSkPop",
"aRz": 4.66,
"strarz": "4.66"
"layerPop": "RealSkPop"
}];
useEffect(()=>{
@ -203,7 +191,7 @@ function ARzSk({data}) {
{tableRow.stnm}
</div>
</DpTableCell>
<DpTableCell align="center" >小(2)型</DpTableCell>
<DpTableCell align="center" >大型水库</DpTableCell>
<DpTableCell align="center" >
{tableRow.rz}
<span style={{color:'red',marginLeft:'0.5rem'}}>+{(tableRow.rz-tableRow.fsltdz).toFixed(2)}</span>

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

@ -222,14 +222,14 @@ export default function Overall({ style }) {
"h12": 4,
"h24": 4,
"h48": 4,
"drpState": 1,
"rz": 60.7,
"drpState": 2,
"rz": 65.7,
"w": 45490,
"xs":32133,
"a_fsltdz": -4.189999999999998,
"rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 0,
"rzState": 1,
"rzWarning": 1,
"rzState": 2,
"layer": "RealSkLayer",
"layerPop": "RealSkPop"
},
@ -386,7 +386,11 @@ export default function Overall({ style }) {
'layout': {
// 'icon-allow-overlap': true,
// 'text-allow-overlap': true,
'icon-image': '水库', // 从properties中动态读取icon字段
'icon-image': [
'case',
['==', ['get', 'rzWarning'], 1], '水库-超汛限',
'水库'
], // 从properties中动态读取icon字段
'icon-size': [
'interpolate', ['linear'], ['zoom'],
10, 0.8,

86
src/views/Home/panels/SkWarning/index.js
View File

@ -131,51 +131,41 @@ export default function Overall({ style }) {
};
const skData =[{
"stcd": "716129061",
"type": "sk",
"hasRz": true,
"stnm": "仰天窝水库",
"adcd": "421181201000",
"wscd": null,
"importancy": 0,
"lgtd": 115.106667,
"lttd": 31.126389,
"elev": 0,
"damel": 325.08,
"dsflz": 324.18,
"fsltdz": 323.5,
"ddz": 319.5,
"zcxsw": 323.5,
"drpTm": "2025-04-11T05:00:00.000Z",
"today": 0,
"h1": 0,
"h3": 0,
"h6": 0,
"h12": 0,
"h24": 0,
"h48": 0,
"drpState": 2,
"rz": 325.16,
"w": 0.132,
"a_fsltdz": 4.660000000000025,
"rzTm": "2025-04-11T05:00:00.000Z",
"rzWarning": 1,
"rzState": 2,
"pic": [
{
"stcd": "716129061",
"tm": "2023-03-12T06:05:00.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129061/20230312140500.jpg"
},
{
"stcd": "716129061",
"tm": "2023-03-12T07:25:00.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129062/20230312152500.jpg"
}
],
"aRz": 4.66,
"strarz": "4.66"
}];
"stcd": "61614200",
"type": "sk",
"hasRz": true,
"stnm": "浮桥河水库",
"adcd": "421181100000",
"wscd": null,
"importancy": 0,
"lgtd": 114.88069,
"lttd": 31.171967,
"elev": 0,
"damel": 71.33,
"dsflz": 68.04,
"fsltdz": 64.89,
"ddz": 51.78,
"zcxsw": 64.89,
"jhhsw":68.7,
"drpTm": "2025-06-06T22:00:00.000Z",
"today": 4,
"h1": 4,
"h3": 4,
"h6": 4,
"h12": 4,
"h24": 4,
"h48": 4,
"drpState": 2,
"rz": 65.7,
"w": 45490,
"xs":32133,
"a_fsltdz": -4.189999999999998,
"rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 1,
"rzState": 2,
"layer": "RealSkLayer",
"layerPop": "RealSkPop"
}];
const flyTo = () => {
const { lgtd, lttd } = skData[0];
if (lgtd && lttd) {
@ -249,12 +239,12 @@ export default function Overall({ style }) {
station.id == "cxx" && <TableRow onClick={() => flyTo()}>
<DpTableCell style={{ width: '20%' }}><div
className="table-ellipsis cursor-pointer"
>仰天窝水库</div></DpTableCell>
>浮桥河水库</div></DpTableCell>
<DpTableCell style={{ width: '20%' }}>325.16(1.66)</DpTableCell>
<DpTableCell style={{ width: '20%' }}><div
className="table-ellipsis cursor-pointer"
>龟山镇</div></DpTableCell>
<DpTableCell style={{ width: '20%' }}>阎家河</DpTableCell>
>中馆驿镇</div></DpTableCell>
<DpTableCell style={{ width: '20%' }}>长江</DpTableCell>
<DpTableCell style={{ width: '20%' }}><a
className="table-ellipsis cursor-pointer"
onClick={() => {

8
src/views/Home/panels/Skzl/index.js
View File

@ -97,11 +97,15 @@ function DrpReal({ style }) {
'layout': {
// 'icon-allow-overlap': true,
// 'text-allow-overlap': true,
'icon-image': '水库', // 从properties中动态读取icon字段
'icon-image': [
'case',
['==', ['get', 'rzWarning'], 1], '水库-超汛限',
'水库'
], // 从properties中动态读取icon字段
'icon-size': [
'interpolate', ['linear'], ['zoom'],
10, 0.8,
14, 0.8,
14, 0.8,
],
'text-size': [
'interpolate', ['linear'], ['zoom'],

62
src/views/Home/panels/Warn/ARzSk.js
View File

@ -37,50 +37,40 @@ function Item({ data, viewInfo, sendMessage }) {
function ARzSk({ data }) {
data = [{
"stcd": "716129061",
"stcd": "61614200",
"type": "sk",
"hasRz": true,
"stnm": "仰天窝水库",
"adcd": "421181201000",
"stnm": "浮桥河水库",
"adcd": "421181100000",
"wscd": null,
"importancy": 0,
"lgtd": 115.106667,
"lttd": 31.126389,
"lgtd": 114.88069,
"lttd": 31.171967,
"elev": 0,
"damel": 325.08,
"dsflz": 324.18,
"fsltdz": 323.5,
"ddz": 319.5,
"zcxsw": 323.5,
"drpTm": "2025-04-11T05:00:00.000Z",
"today": 0,
"h1": 0,
"h3": 0,
"h6": 0,
"h12": 0,
"h24": 0,
"h48": 0,
"damel": 71.33,
"dsflz": 68.04,
"fsltdz": 64.89,
"ddz": 51.78,
"zcxsw": 64.89,
"jhhsw":68.7,
"drpTm": "2025-06-06T22:00:00.000Z",
"today": 4,
"h1": 4,
"h3": 4,
"h6": 4,
"h12": 4,
"h24": 4,
"h48": 4,
"drpState": 2,
"rz": 325.16,
"w": 0.132,
"a_fsltdz": 4.660000000000025,
"rzTm": "2025-04-11T05:00:00.000Z",
"rz": 65.7,
"w": 45490,
"xs":32133,
"a_fsltdz": -4.189999999999998,
"rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 1,
"rzState": 2,
"pic": [
{
"stcd": "716129061",
"tm": "2023-03-12T06:05:00.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129061/20230312140500.jpg"
},
{
"stcd": "716129061",
"tm": "2023-03-12T07:25:00.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129062/20230312152500.jpg"
}
],
"aRz": 4.66,
"strarz": "4.66"
"layer": "RealSkLayer",
"layerPop": "RealSkPop"
}];
const dispatch = useDispatch();

39
src/views/Home/panels/Zyskyb/index.js
View File

@ -27,30 +27,33 @@ function DrpReal({ style }) {
"adcd": "421181100000",
"wscd": null,
"importancy": 0,
"lgtd": 114.875,
"lttd": 31.166667,
"lgtd": 114.88069,
"lttd": 31.171967,
"elev": 0,
"damel": 71.33,
"dsflz": 68.04,
"fsltdz": 64.89,
"ddz": 51.78,
"zcxsw": 64.89,
"drpTm": "2025-06-03T02:00:00.000Z",
"today": 0,
"h1": 0,
"h3": 0,
"h6": 0,
"h12": 0,
"h24": 0,
"h48": 16.5,
"drpState": 1,
"rz": 60.71,
"w": 162.8,
"a_fsltdz": -4.18,
"rzTm": "2025-06-03T02:00:00.000Z",
"rzWarning": 0,
"rzState": 1,
"aRz": -4.18
"jhhsw":68.7,
"drpTm": "2025-06-06T22:00:00.000Z",
"today": 4,
"h1": 4,
"h3": 4,
"h6": 4,
"h12": 4,
"h24": 4,
"h48": 4,
"drpState": 2,
"rz": 65.7,
"w": 45490,
"xs":32133,
"a_fsltdz": -4.189999999999998,
"rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 1,
"rzState": 2,
"layer": "RealSkLayer",
"layerPop": "RealSkPop"
},{
"stcd": "61612610",
"type": "sk",