Compare commits

...

7 Commits

Author SHA1 Message Date
李神峰 4508e5d59c merge: 合并冲突 2025-06-10 13:55:27 +08:00
秦子超 b379a58cc8 修改数据 2025-06-10 13:52:31 +08:00
秦子超 69e11dad51 合并 2025-06-09 16:27:41 +08:00
秦子超 3fabf984a6 :wq
Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/mcfxkh-Web
2025-06-09 16:26:02 +08:00
秦子超 ef0ed5e310 提交 2025-06-09 16:22:37 +08:00
秦子超 65a8a61a7f Merge branch 'qzc-dev' 2025-06-09 15:50:18 +08:00
秦子超 38d5efeeba 提交 2025-06-09 15:49:14 +08:00
35 changed files with 2163 additions and 1495 deletions

BIN
public/assets/管网.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 616 KiB

After

Width:  |  Height:  |  Size: 117 KiB

File diff suppressed because it is too large Load Diff

View File

@ -16,13 +16,13 @@
"sfz": null, "sfz": null,
"sfq": null, "sfq": null,
"type": "sh", "type": "sh",
"tm": "2025-06-08T03:00:00.000Z", "tm": "2025-06-06T22:00:00.000Z",
"rz": 77.24, "rz": 76.99,
"trend": 0, "trend": 1,
"state": 1, "state": 1,
"warning": 0, "warning": 0,
"maxRz": 77.35, "maxRz": 76.99,
"maxDate": "2025-06-07T16:05:00.000Z", "maxDate": "2025-06-05T17:25:00.000Z",
"warndes": null "warndes": null
}, },
{ {
@ -42,13 +42,13 @@
"sfz": null, "sfz": null,
"sfq": null, "sfq": null,
"type": "sh", "type": "sh",
"tm": "2025-06-08T03:05:00.000Z", "tm": "2025-06-06T22:15:00.000Z",
"rz": 55.66, "rz": 55.67,
"trend": 0, "trend": 0,
"state": 1, "state": 1,
"warning": 0, "warning": 0,
"maxRz": 55.67, "maxRz": 55.67,
"maxDate": "2025-06-07T19:30:00.000Z", "maxDate": "2025-06-06T02:05:00.000Z",
"warndes": null "warndes": null
}, },
{ {
@ -68,13 +68,13 @@
"sfz": null, "sfz": null,
"sfq": null, "sfq": null,
"type": "sh", "type": "sh",
"tm": "2025-06-08T03:00:00.000Z", "tm": "2025-06-06T22:00:00.000Z",
"rz": 27.57, "rz": 27.57,
"trend": 0, "trend": 0,
"state": 1, "state": 1,
"warning": 0, "warning": 0,
"maxRz": 27.57, "maxRz": 27.57,
"maxDate": "2025-06-07T22:35:00.000Z", "maxDate": "2025-06-05T17:50:00.000Z",
"warndes": null "warndes": null
}, },
{ {
@ -94,13 +94,13 @@
"sfz": null, "sfz": null,
"sfq": null, "sfq": null,
"type": "sh", "type": "sh",
"tm": "2025-06-08T03:00:00.000Z", "tm": "2025-06-06T22:00:00.000Z",
"rz": 21.87, "rz": 21.84,
"trend": 1, "trend": -1,
"state": 1, "state": 1,
"warning": 0, "warning": 0,
"maxRz": 21.94, "maxRz": 21.9,
"maxDate": "2025-06-07T16:00:00.000Z", "maxDate": "2025-06-06T04:30:00.000Z",
"warndes": null "warndes": null
}, },
{ {
@ -120,13 +120,13 @@
"sfz": null, "sfz": null,
"sfq": null, "sfq": null,
"type": "sh", "type": "sh",
"tm": "2025-06-08T03:00:00.000Z", "tm": "2025-06-06T22:15:00.000Z",
"rz": 112.71, "rz": 112.71,
"trend": 0, "trend": 0,
"state": 1, "state": 1,
"warning": 0, "warning": 0,
"maxRz": 112.71, "maxRz": 112.71,
"maxDate": "2025-06-08T00:10:00.000Z", "maxDate": "2025-06-06T14:05:00.000Z",
"warndes": null "warndes": null
}, },
{ {
@ -140,8 +140,8 @@
"elev": null, "elev": null,
"hasRz": true, "hasRz": true,
"type": "sw", "type": "sw",
"tm": "2025-06-08T03:00:00.000Z", "tm": "2025-06-06T22:00:00.000Z",
"rz": 52.85, "rz": 52.44,
"state": 1 "state": 1
}, },
{ {
@ -155,8 +155,8 @@
"elev": null, "elev": null,
"hasRz": true, "hasRz": true,
"type": "sw", "type": "sw",
"tm": "2025-06-08T03:00:00.000Z", "tm": "2025-06-06T22:00:00.000Z",
"rz": 51.432, "rz": 51.387,
"state": 1 "state": 1
}, },
{ {
@ -170,7 +170,7 @@
"elev": null, "elev": null,
"hasRz": true, "hasRz": true,
"type": "sw", "type": "sw",
"tm": "2025-06-08T03:00:00.000Z", "tm": "2025-06-06T22:00:00.000Z",
"rz": 73.37, "rz": 73.37,
"state": 1 "state": 1
}, },
@ -185,8 +185,8 @@
"elev": null, "elev": null,
"hasRz": true, "hasRz": true,
"type": "sw", "type": "sw",
"tm": "2025-06-08T03:00:00.000Z", "tm": "2025-06-06T22:00:00.000Z",
"rz": 61.98, "rz": 61.59,
"state": 1 "state": 1
}, },
{ {
@ -200,8 +200,8 @@
"elev": null, "elev": null,
"hasRz": true, "hasRz": true,
"type": "sw", "type": "sw",
"tm": "2025-06-08T03:00:00.000Z", "tm": "2025-06-06T21:00:00.000Z",
"rz": 134.21, "rz": 133.89,
"state": 1 "state": 1
}, },
{ {
@ -215,7 +215,7 @@
"elev": null, "elev": null,
"hasRz": true, "hasRz": true,
"type": "sw", "type": "sw",
"tm": "2025-06-08T03:00:00.000Z", "tm": "2025-06-06T22:00:00.000Z",
"rz": 43.6, "rz": 43.6,
"state": 1 "state": 1
} }

View File

@ -1,6 +1,6 @@
{ {
"tm2": "08日11时", "tm2": "07日6时",
"tm1": "07日11时", "tm1": "06日6时",
"drpInfo": { "drpInfo": {
"stCount": { "stCount": {
"total": 379, "total": 379,
@ -12,85 +12,85 @@
}, },
"h1": { "h1": {
"drpStCount": { "drpStCount": {
"total": 75, "total": 98,
"sh": 15, "sh": 34,
"sw": 22, "sw": 25,
"sk": 5, "sk": 6,
"qx": 33 "qx": 33
}, },
"max": { "max": {
"value": 7.5, "value": 50.2,
"stnm": "芭茅河水库", "stnm": "福田河",
"stcd": "61612580", "stcd": "Q9111",
"type": "sk" "type": "qx"
}, },
"cntDrp10": 75, "cntDrp10": 41,
"cntDrp25": 0, "cntDrp25": 37,
"cntDrp50": 0, "cntDrp50": 18,
"cntDrp100": 0, "cntDrp100": 2,
"cntDrp250": 0, "cntDrp250": 0,
"cntDrpg250": 0 "cntDrpg250": 0
}, },
"h3": { "h3": {
"drpStCount": { "drpStCount": {
"total": 91, "total": 99,
"sh": 31, "sh": 35,
"sw": 22, "sw": 25,
"sk": 5, "sk": 6,
"qx": 33 "qx": 33
}, },
"max": { "max": {
"value": 14.3, "value": 50.3,
"stnm": "下白米", "stnm": "福田河",
"stcd": "Q9123", "stcd": "Q9111",
"type": "qx" "type": "qx"
}, },
"cntDrp10": 83, "cntDrp10": 38,
"cntDrp25": 8, "cntDrp25": 35,
"cntDrp50": 0, "cntDrp50": 21,
"cntDrp100": 0, "cntDrp100": 5,
"cntDrp250": 0, "cntDrp250": 0,
"cntDrpg250": 0 "cntDrpg250": 0
}, },
"h6": { "h6": {
"drpStCount": { "drpStCount": {
"total": 94, "total": 99,
"sh": 31, "sh": 35,
"sw": 23, "sw": 25,
"sk": 6, "sk": 6,
"qx": 34 "qx": 33
}, },
"max": { "max": {
"value": 22.7, "value": 50.3,
"stnm": "下白米", "stnm": "福田河",
"stcd": "Q9123", "stcd": "Q9111",
"type": "qx" "type": "qx"
}, },
"cntDrp10": 63, "cntDrp10": 38,
"cntDrp25": 31, "cntDrp25": 35,
"cntDrp50": 0, "cntDrp50": 21,
"cntDrp100": 0, "cntDrp100": 5,
"cntDrp250": 0, "cntDrp250": 0,
"cntDrpg250": 0 "cntDrpg250": 0
}, },
"h24": { "h24": {
"drpStCount": { "drpStCount": {
"total": 100, "total": 99,
"sh": 34, "sh": 35,
"sw": 26, "sw": 25,
"sk": 6, "sk": 6,
"qx": 34 "qx": 33
}, },
"max": { "max": {
"value": 45.2, "value": 50.3,
"stnm": "下白米", "stnm": "福田河",
"stcd": "Q9123", "stcd": "Q9111",
"type": "qx" "type": "qx"
}, },
"cntDrp10": 23, "cntDrp10": 38,
"cntDrp25": 52, "cntDrp25": 35,
"cntDrp50": 25, "cntDrp50": 21,
"cntDrp100": 0, "cntDrp100": 5,
"cntDrp250": 0, "cntDrp250": 0,
"cntDrpg250": 0 "cntDrpg250": 0
} }
@ -104,34 +104,130 @@
"aRzSk": [], "aRzSk": [],
"drpSk": [ "drpSk": [
{ {
"stcd": "61614200", "stcd": "61612700",
"type": "sk", "type": "sk",
"hasRz": true, "hasRz": true,
"stnm": "浮桥河水库", "stnm": "碧绿河水库",
"adcd": "421181100000", "adcd": "421181109000",
"wscd": null, "wscd": null,
"importancy": 0, "importancy": 0,
"lgtd": 114.875, "lgtd": 115.214444,
"lttd": 31.166667, "lttd": 31.299722,
"elev": 0, "elev": 0,
"damel": 71.33, "damel": 142.9,
"dsflz": 68.04, "dsflz": 139.08,
"fsltdz": 64.89, "fsltdz": 137,
"ddz": 51.78, "ddz": 105,
"zcxsw": 64.89, "zcxsw": 137,
"drpTm": "2025-06-08T03:00:00.000Z", "drpTm": "2025-06-06T22:00:00.000Z",
"today": 13, "today": 50,
"h1": 1, "h1": 38,
"h3": 8.5, "h3": 50,
"h6": 16, "h6": 50,
"h12": 19, "h12": 50,
"h24": 26.5, "h24": 50,
"h48": 70, "h48": 50,
"drpState": 1, "drpState": 1,
"rz": 60.78, "rz": 120,
"w": 164.6, "w": 13.55,
"a_fsltdz": -4.109999999999999, "a_fsltdz": -17,
"rzTm": "2025-06-08T03:00:00.000Z", "rzTm": "2025-06-06T00:00:00.000Z",
"rzWarning": 0,
"rzState": 2
},
{
"stcd": "61612560",
"type": "sk",
"hasRz": true,
"stnm": "大河铺水库",
"adcd": "421181112000",
"wscd": null,
"importancy": 0,
"lgtd": 114.941111,
"lttd": 31.464444,
"elev": 0,
"damel": 162.21,
"dsflz": 160.08,
"fsltdz": 159,
"ddz": 142.5,
"zcxsw": 159,
"drpTm": "2025-06-06T22:00:00.000Z",
"today": 50,
"h1": 50,
"h3": 50,
"h6": 50,
"h12": 50,
"h24": 50,
"h48": 50,
"drpState": 1,
"rz": 144.5,
"w": 1.66,
"a_fsltdz": -14.5,
"rzTm": "2025-06-06T00:00:00.000Z",
"rzWarning": 0,
"rzState": 2
},
{
"stcd": "61612610",
"type": "sk",
"hasRz": true,
"stnm": "三河口水库",
"adcd": "421181109000",
"wscd": null,
"importancy": 0,
"lgtd": 115.166667,
"lttd": 31.333333,
"elev": 0,
"damel": 156.8,
"dsflz": 154.99,
"fsltdz": 149,
"ddz": 124,
"zcxsw": 149,
"drpTm": "2025-06-06T22:00:00.000Z",
"today": 43.5,
"h1": 32,
"h3": 43.5,
"h6": 43.5,
"h12": 43.5,
"h24": 43.5,
"h48": 43.5,
"drpState": 1,
"rz": 141.56,
"w": 78.3,
"a_fsltdz": -7.439999999999998,
"rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 0,
"rzState": 1
},
{
"stcd": "61612580",
"type": "sk",
"hasRz": true,
"stnm": "芭茅河水库",
"adcd": "421181110000",
"wscd": null,
"importancy": 0,
"lgtd": 115.101389,
"lttd": 31.307778,
"elev": 0,
"damel": 127.8,
"dsflz": 125.57,
"fsltdz": 122.44,
"ddz": 106.94,
"zcxsw": 122.44,
"drpTm": "2025-06-06T22:00:00.000Z",
"today": 18,
"h1": 18,
"h3": 18,
"h6": 18,
"h12": 18,
"h24": 18,
"h48": 18,
"drpState": 1,
"rz": 117.78,
"w": 6.215,
"a_fsltdz": -4.659999999999997,
"rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 0, "rzWarning": 0,
"rzState": 1 "rzState": 1
}, },
@ -151,90 +247,158 @@
"fsltdz": 93, "fsltdz": 93,
"ddz": 78.02, "ddz": 78.02,
"zcxsw": 93, "zcxsw": 93,
"drpTm": "2025-06-08T03:00:00.000Z", "drpTm": "2025-06-06T22:00:00.000Z",
"today": 13, "today": 15,
"h1": 2.5, "h1": 15,
"h3": 10.5, "h3": 15,
"h6": 14, "h6": 15,
"h12": 15.5, "h12": 15,
"h24": 22, "h24": 15,
"h48": 74.5, "h48": 15,
"drpState": 1, "drpState": 1,
"rz": 85.27, "rz": 84.67,
"w": 54.6, "w": 50.9,
"a_fsltdz": -7.730000000000004, "a_fsltdz": -8.329999999999998,
"rzTm": "2025-06-08T03:00:00.000Z", "rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 0, "rzWarning": 0,
"rzState": 1 "rzState": 1
}, }
],
"warnDrpSt": [
{ {
"stcd": "61612700", "stcd": "61615110",
"type": "sk", "stnm": "杨梅河(木子店)",
"hasRz": true, "adcd": "421181000000000",
"stnm": "碧绿河水库",
"adcd": "421181109000",
"wscd": null, "wscd": null,
"importancy": 0, "importancy": 0,
"lgtd": 115.214444, "lgtd": 115.339667,
"lttd": 31.299722, "lttd": 31.1595,
"elev": 0, "elev": null,
"damel": 142.9, "hasRz": true,
"dsflz": 139.08, "type": "sh",
"fsltdz": 137, "today": 46,
"ddz": 105, "h1": 44,
"zcxsw": 137, "h3": 46,
"drpTm": "2025-06-08T03:00:00.000Z", "h6": 46,
"today": 8.5, "h12": 46,
"h1": 6, "h24": 46,
"h3": 7.5, "h48": 46,
"h6": 9, "tm": "2025-06-06T22:25:00.000Z",
"h12": 10.5, "state": 1,
"h24": 18, "warning": 0
"h48": 106.5,
"drpState": 1,
"rz": 121,
"w": 14.7,
"a_fsltdz": -16,
"rzTm": "2025-06-08T00:00:00.000Z",
"rzWarning": 0,
"rzState": 2
}, },
{ {
"stcd": "61612580", "stcd": "61641700",
"type": "sk", "stnm": "前畈(三河口)",
"hasRz": true, "adcd": "421181000000000",
"stnm": "芭茅河水库",
"adcd": "421181110000",
"wscd": null, "wscd": null,
"importancy": 0, "importancy": 0,
"lgtd": 115.101389, "lgtd": 115.2267,
"lttd": 31.307778, "lttd": 31.3925,
"elev": 0, "elev": null,
"damel": 127.8, "hasRz": false,
"dsflz": 125.57, "type": "sh",
"fsltdz": 122.44, "today": 32,
"ddz": 106.94, "h1": 32,
"zcxsw": 122.44, "h3": 32,
"drpTm": "2025-06-08T03:00:00.000Z", "h6": 32,
"today": 9, "h12": 32,
"h1": 7.5, "h24": 32,
"h3": 8, "h48": 32,
"h6": 9.5, "tm": "2025-06-06T22:25:00.000Z",
"h12": 11.5, "state": 1,
"h24": 17.5, "warning": 0
"h48": 65.5, },
"drpState": 1, {
"rz": 117.75, "stcd": "61641750",
"w": 6.191, "stnm": "金盘地(三河口)",
"a_fsltdz": -4.689999999999998, "adcd": "421181000000000",
"rzTm": "2025-06-08T03:00:00.000Z", "wscd": null,
"rzWarning": 0, "importancy": 0,
"rzState": 1 "lgtd": 115.2188,
"lttd": 31.2545,
"elev": null,
"hasRz": false,
"type": "sh",
"today": 46.5,
"h1": 36.5,
"h3": 46.5,
"h6": 46.5,
"h12": 46.5,
"h24": 46.5,
"h48": 46.5,
"tm": "2025-06-06T22:25:00.000Z",
"state": 1,
"warning": 0
},
{
"stcd": "61641850",
"stnm": "饶家畈(三河口)",
"adcd": "421181000000000",
"wscd": null,
"importancy": 0,
"lgtd": 115.318333,
"lttd": 31.293611,
"elev": null,
"hasRz": false,
"type": "sh",
"today": 44.5,
"h1": 43,
"h3": 44.5,
"h6": 44.5,
"h12": 44.5,
"h24": 44.5,
"h48": 44.5,
"tm": "2025-06-06T22:25:00.000Z",
"state": 1,
"warning": 0
},
{
"stcd": "61641900",
"stnm": "周家河(三河口)",
"adcd": "421181000000000",
"wscd": null,
"importancy": 0,
"lgtd": 115.164166666,
"lttd": 31.32916667,
"elev": null,
"hasRz": false,
"type": "sh",
"today": 51.5,
"h1": 44.5,
"h3": 51.5,
"h6": 51.5,
"h12": 51.5,
"h24": 51.5,
"h48": 51.5,
"tm": "2025-06-06T22:15:00.000Z",
"state": 1,
"warning": 0
},
{
"stcd": "61642040",
"stnm": "月形塘(龟山)",
"adcd": "421181000000000",
"wscd": null,
"importancy": 0,
"lgtd": 115.2875,
"lttd": 31.2292,
"elev": null,
"hasRz": false,
"type": "sh",
"today": 50.5,
"h1": 49,
"h3": 50.5,
"h6": 50.5,
"h12": 50.5,
"h24": 50.5,
"h48": 50.5,
"tm": "2025-06-06T22:25:00.000Z",
"state": 0,
"warning": 1
}, },
{ {
"stcd": "61612610", "stcd": "61612610",
"type": "sk",
"hasRz": true,
"stnm": "三河口水库", "stnm": "三河口水库",
"adcd": "421181109000", "adcd": "421181109000",
"wscd": null, "wscd": null,
@ -242,29 +406,196 @@
"lgtd": 115.166667, "lgtd": 115.166667,
"lttd": 31.333333, "lttd": 31.333333,
"elev": 0, "elev": 0,
"damel": 156.8, "hasRz": true,
"dsflz": 154.99, "type": "sk",
"fsltdz": 149, "tm": "2025-06-06T22:00:00.000Z",
"ddz": 124, "today": 43.5,
"zcxsw": 149, "h1": 32,
"drpTm": "2025-06-08T03:00:00.000Z", "h3": 43.5,
"today": 5, "h6": 43.5,
"h1": 3.5, "h12": 43.5,
"h3": 4.5, "h24": 43.5,
"h6": 5.5, "h48": 43.5,
"h12": 7.5, "state": 1,
"h24": 13, "warning": 0
"h48": 96.5, },
"drpState": 1, {
"rz": 141.98, "stcd": "61612700",
"w": 80.5, "stnm": "碧绿河水库",
"a_fsltdz": -7.02000000000001, "adcd": "421181109000",
"rzTm": "2025-06-08T03:00:00.000Z", "wscd": null,
"rzWarning": 0, "importancy": 0,
"rzState": 1 "lgtd": 115.214444,
"lttd": 31.299722,
"elev": 0,
"hasRz": true,
"type": "sk",
"tm": "2025-06-06T22:00:00.000Z",
"today": 50,
"h1": 38,
"h3": 50,
"h6": 50,
"h12": 50,
"h24": 50,
"h48": 50,
"state": 1,
"warning": 0
},
{
"stcd": "61612560",
"stnm": "大河铺水库",
"adcd": "421181112000",
"wscd": null,
"importancy": 0,
"lgtd": 114.941111,
"lttd": 31.464444,
"elev": 0,
"hasRz": true,
"type": "sk",
"tm": "2025-06-06T22:00:00.000Z",
"today": 50,
"h1": 50,
"h3": 50,
"h6": 50,
"h12": 50,
"h24": 50,
"h48": 50,
"state": 1,
"warning": 0
},
{
"stcd": "61641600",
"stnm": "张广河",
"adcd": null,
"wscd": null,
"importancy": 0,
"lgtd": 115.316887,
"lttd": 31.352877,
"elev": null,
"hasRz": false,
"type": "sw",
"today": 31,
"h1": 30.5,
"h3": 31,
"h6": 31,
"h12": 31,
"h24": 31,
"h48": 31,
"tm": "2025-06-06T22:00:00.000Z",
"state": 1,
"warning": 0
},
{
"stcd": "61643200",
"stnm": "西张店",
"adcd": null,
"wscd": null,
"importancy": 0,
"lgtd": 114.876389,
"lttd": 31.441389,
"elev": null,
"hasRz": false,
"type": "sw",
"today": 41.5,
"h1": 41.5,
"h3": 41.5,
"h6": 41.5,
"h12": 41.5,
"h24": 41.5,
"h48": 41.5,
"tm": "2025-06-06T22:00:00.000Z",
"state": 1,
"warning": 0
},
{
"stcd": "Q0142",
"stnm": "武麻高速K717+850",
"adcd": null,
"wscd": null,
"importancy": 0,
"lgtd": 115.1917,
"lttd": 31.2036,
"elev": null,
"hasRz": false,
"type": "qx",
"today": 36.6,
"h1": 36.6,
"h3": 36.6,
"h6": 36.6,
"h12": 36.6,
"h24": 36.6,
"h48": 36.6,
"tm": "2025-06-06T22:00:00.000Z",
"state": 1,
"warning": 0
},
{
"stcd": "Q9107",
"stnm": "三河口",
"adcd": null,
"wscd": null,
"importancy": 0,
"lgtd": 115.2414,
"lttd": 31.3308,
"elev": null,
"hasRz": false,
"type": "qx",
"today": 45,
"h1": 34.4,
"h3": 45,
"h6": 45,
"h12": 45,
"h24": 45,
"h48": 45,
"tm": "2025-06-06T22:00:00.000Z",
"state": 1,
"warning": 0
},
{
"stcd": "Q9111",
"stnm": "福田河",
"adcd": null,
"wscd": null,
"importancy": 0,
"lgtd": 115.0944,
"lttd": 31.4747,
"elev": null,
"hasRz": false,
"type": "qx",
"today": 50.3,
"h1": 50.2,
"h3": 50.2,
"h6": 50.2,
"h12": 50.2,
"h24": 50.3,
"h48": 50.3,
"tm": "2025-06-06T22:00:00.000Z",
"state": 1,
"warning": 0
},
{
"stcd": "Q9127",
"stnm": "方家山",
"adcd": null,
"wscd": null,
"importancy": 0,
"lgtd": 115.1656,
"lttd": 31.195,
"elev": null,
"hasRz": false,
"type": "qx",
"today": 35.5,
"h1": 35.5,
"h3": 35.5,
"h6": 35.5,
"h12": 35.5,
"h24": 35.5,
"h48": 35.5,
"tm": "2025-06-06T22:00:00.000Z",
"state": 1,
"warning": 0
} }
], ],
"warnDrpSt": [],
"crucialRz": [ "crucialRz": [
{ {
"stcd": "61615300", "stcd": "61615300",
@ -277,8 +608,8 @@
"elev": null, "elev": null,
"hasRz": true, "hasRz": true,
"type": "sw", "type": "sw",
"tm": "2025-06-08T03:00:00.000Z", "tm": "2025-06-06T21:00:00.000Z",
"rz": 134.21, "rz": 133.89,
"state": 1 "state": 1
} }
] ]

View File

@ -631,19 +631,19 @@
"fsltdz": 93, "fsltdz": 93,
"ddz": 78.02, "ddz": 78.02,
"zcxsw": 93, "zcxsw": 93,
"drpTm": "2025-06-08T03:00:00.000Z", "drpTm": "2025-06-06T22:00:00.000Z",
"today": 13, "today": 15,
"h1": 2.5, "h1": 15,
"h3": 10.5, "h3": 15,
"h6": 14, "h6": 15,
"h12": 15.5, "h12": 15,
"h24": 22, "h24": 15,
"h48": 74.5, "h48": 15,
"drpState": 1, "drpState": 1,
"rz": 85.27, "rz": 84.67,
"w": 54.6, "w": 50.9,
"a_fsltdz": -7.730000000000004, "a_fsltdz": -8.329999999999998,
"rzTm": "2025-06-08T03:00:00.000Z", "rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 0, "rzWarning": 0,
"rzState": 1 "rzState": 1
}, },
@ -663,19 +663,19 @@
"fsltdz": 98.3, "fsltdz": 98.3,
"ddz": 81.5, "ddz": 81.5,
"zcxsw": 98.3, "zcxsw": 98.3,
"drpTm": "2025-06-08T00:00:00.000Z", "drpTm": "2025-06-06T00:00:00.000Z",
"today": 1, "today": 0,
"h1": 0, "h1": 0,
"h3": 0, "h3": 0,
"h6": 1, "h6": 0,
"h12": 1, "h12": 0,
"h24": 1, "h24": 0,
"h48": 1, "h48": 0,
"drpState": 2, "drpState": 2,
"rz": 83.6, "rz": 83,
"w": 1.4, "w": 1.27,
"a_fsltdz": -14.700000000000003, "a_fsltdz": -15.299999999999997,
"rzTm": "2025-06-08T00:00:00.000Z", "rzTm": "2025-06-06T00:00:00.000Z",
"rzWarning": 0, "rzWarning": 0,
"rzState": 2 "rzState": 2
}, },
@ -695,19 +695,19 @@
"fsltdz": 208.48, "fsltdz": 208.48,
"ddz": 194.6, "ddz": 194.6,
"zcxsw": 208.48, "zcxsw": 208.48,
"drpTm": "2025-06-08T00:00:00.000Z", "drpTm": "2025-06-06T00:00:00.000Z",
"today": 0.5, "today": 0,
"h1": 0, "h1": 0,
"h3": 0, "h3": 0,
"h6": 0.5, "h6": 0,
"h12": 0.5, "h12": 0,
"h24": 0.5, "h24": 0,
"h48": 1.5, "h48": 0,
"drpState": 2, "drpState": 2,
"rz": 203.8, "rz": 203.4,
"w": 9.6, "w": 9.15,
"a_fsltdz": -4.679999999999978, "a_fsltdz": -5.079999999999984,
"rzTm": "2025-06-08T00:00:00.000Z", "rzTm": "2025-06-06T00:00:00.000Z",
"rzWarning": 0, "rzWarning": 0,
"rzState": 2 "rzState": 2
}, },
@ -1775,27 +1775,27 @@
"adcd": "421181100000", "adcd": "421181100000",
"wscd": null, "wscd": null,
"importancy": 0, "importancy": 0,
"lgtd": 114.875, "lgtd": 114.88069,
"lttd": 31.166667, "lttd": 31.171967,
"elev": 0, "elev": 0,
"damel": 71.33, "damel": 71.33,
"dsflz": 68.04, "dsflz": 68.04,
"fsltdz": 64.89, "fsltdz": 64.89,
"ddz": 51.78, "ddz": 51.78,
"zcxsw": 64.89, "zcxsw": 64.89,
"drpTm": "2025-06-08T03:00:00.000Z", "drpTm": "2025-06-06T22:00:00.000Z",
"today": 13, "today": 4,
"h1": 1, "h1": 4,
"h3": 8.5, "h3": 4,
"h6": 16, "h6": 4,
"h12": 19, "h12": 4,
"h24": 26.5, "h24": 4,
"h48": 70, "h48": 4,
"drpState": 1, "drpState": 1,
"rz": 60.78, "rz": 60.7,
"w": 164.6, "w": 162.5,
"a_fsltdz": -4.109999999999999, "a_fsltdz": -4.189999999999998,
"rzTm": "2025-06-08T03:00:00.000Z", "rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 0, "rzWarning": 0,
"rzState": 1 "rzState": 1
}, },
@ -5203,19 +5203,19 @@
"fsltdz": 149, "fsltdz": 149,
"ddz": 124, "ddz": 124,
"zcxsw": 149, "zcxsw": 149,
"drpTm": "2025-06-08T03:00:00.000Z", "drpTm": "2025-06-06T22:00:00.000Z",
"today": 5, "today": 43.5,
"h1": 3.5, "h1": 32,
"h3": 4.5, "h3": 43.5,
"h6": 5.5, "h6": 43.5,
"h12": 7.5, "h12": 43.5,
"h24": 13, "h24": 43.5,
"h48": 96.5, "h48": 43.5,
"drpState": 1, "drpState": 1,
"rz": 141.98, "rz": 141.56,
"w": 80.5, "w": 78.3,
"a_fsltdz": -7.02000000000001, "a_fsltdz": -7.439999999999998,
"rzTm": "2025-06-08T03:00:00.000Z", "rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 0, "rzWarning": 0,
"rzState": 1 "rzState": 1
}, },
@ -5235,19 +5235,19 @@
"fsltdz": 137, "fsltdz": 137,
"ddz": 105, "ddz": 105,
"zcxsw": 137, "zcxsw": 137,
"drpTm": "2025-06-08T03:00:00.000Z", "drpTm": "2025-06-06T22:00:00.000Z",
"today": 8.5, "today": 50,
"h1": 6, "h1": 38,
"h3": 7.5, "h3": 50,
"h6": 9, "h6": 50,
"h12": 10.5, "h12": 50,
"h24": 18, "h24": 50,
"h48": 106.5, "h48": 50,
"drpState": 1, "drpState": 1,
"rz": 121, "rz": 120,
"w": 14.7, "w": 13.55,
"a_fsltdz": -16, "a_fsltdz": -17,
"rzTm": "2025-06-08T00:00:00.000Z", "rzTm": "2025-06-06T00:00:00.000Z",
"rzWarning": 0, "rzWarning": 0,
"rzState": 2 "rzState": 2
}, },
@ -7147,19 +7147,19 @@
"fsltdz": 167.4, "fsltdz": 167.4,
"ddz": 149, "ddz": 149,
"zcxsw": 167.4, "zcxsw": 167.4,
"drpTm": "2025-06-08T00:00:00.000Z", "drpTm": "2025-06-06T00:00:00.000Z",
"today": 0.5, "today": 0,
"h1": 0, "h1": 0,
"h3": 0, "h3": 0,
"h6": 0.5, "h6": 0,
"h12": 0.5, "h12": 0,
"h24": 0.5, "h24": 0,
"h48": 0.5, "h48": 0,
"drpState": 2, "drpState": 2,
"rz": 157.4, "rz": 156.8,
"w": 4.36, "w": 4.09,
"a_fsltdz": -10, "a_fsltdz": -10.599999999999994,
"rzTm": "2025-06-08T00:00:00.000Z", "rzTm": "2025-06-06T00:00:00.000Z",
"rzWarning": 0, "rzWarning": 0,
"rzState": 2 "rzState": 2
}, },
@ -7883,19 +7883,19 @@
"fsltdz": 122.44, "fsltdz": 122.44,
"ddz": 106.94, "ddz": 106.94,
"zcxsw": 122.44, "zcxsw": 122.44,
"drpTm": "2025-06-08T03:00:00.000Z", "drpTm": "2025-06-06T22:00:00.000Z",
"today": 9, "today": 18,
"h1": 7.5, "h1": 18,
"h3": 8, "h3": 18,
"h6": 9.5, "h6": 18,
"h12": 11.5, "h12": 18,
"h24": 17.5, "h24": 18,
"h48": 65.5, "h48": 18,
"drpState": 1, "drpState": 1,
"rz": 117.75, "rz": 117.78,
"w": 6.191, "w": 6.215,
"a_fsltdz": -4.689999999999998, "a_fsltdz": -4.659999999999997,
"rzTm": "2025-06-08T03:00:00.000Z", "rzTm": "2025-06-06T22:00:00.000Z",
"rzWarning": 0, "rzWarning": 0,
"rzState": 1 "rzState": 1
}, },
@ -8663,19 +8663,19 @@
"fsltdz": 159, "fsltdz": 159,
"ddz": 142.5, "ddz": 142.5,
"zcxsw": 159, "zcxsw": 159,
"drpTm": "2025-06-08T03:00:00.000Z", "drpTm": "2025-06-06T22:00:00.000Z",
"today": 0, "today": 50,
"h1": 0, "h1": 50,
"h3": 0, "h3": 50,
"h6": 0.5, "h6": 50,
"h12": 3.5, "h12": 50,
"h24": 5, "h24": 50,
"h48": 65, "h48": 50,
"drpState": 1, "drpState": 1,
"rz": 144.9, "rz": 144.5,
"w": 1.8, "w": 1.66,
"a_fsltdz": -14.099999999999994, "a_fsltdz": -14.5,
"rzTm": "2025-06-08T00:00:00.000Z", "rzTm": "2025-06-06T00:00:00.000Z",
"rzWarning": 0, "rzWarning": 0,
"rzState": 2 "rzState": 2
}, },
@ -11336,18 +11336,18 @@
"fsltdz": 231, "fsltdz": 231,
"ddz": 204, "ddz": 204,
"zcxsw": 231, "zcxsw": 231,
"drpTm": "2025-06-08T00:00:00.000Z", "drpTm": "2025-06-06T00:00:00.000Z",
"today": 0.5, "today": 0,
"h1": 0, "h1": 0,
"h3": 0, "h3": 0,
"h6": 0.5, "h6": 0,
"h12": 0.5, "h12": 0,
"h24": 0.5, "h24": 0,
"h48": 0.5, "h48": 0,
"drpState": 2, "drpState": 2,
"rz": 221.1, "rz": 220.62,
"a_fsltdz": null, "a_fsltdz": null,
"rzTm": "2025-06-08T00:00:00.000Z", "rzTm": "2025-06-06T00:00:00.000Z",
"rzWarning": 0, "rzWarning": 0,
"rzState": 2 "rzState": 2
}, },
@ -11464,15 +11464,15 @@
"fsltdz": 0, "fsltdz": 0,
"ddz": 0, "ddz": 0,
"zcxsw": 0, "zcxsw": 0,
"drpTm": "2025-06-07T23:00:00.000Z", "drpTm": "2025-06-06T20:55:00.000Z",
"today": 0, "today": 0,
"h1": 0, "h1": 0,
"h3": 0, "h3": 0,
"h6": 0, "h6": 0,
"h12": 2, "h12": 0,
"h24": 3, "h24": 0,
"h48": 20, "h48": 0,
"drpState": 2, "drpState": 1,
"rz": 4.75, "rz": 4.75,
"a_fsltdz": null, "a_fsltdz": null,
"rzTm": "2024-01-21T01:00:00.000Z", "rzTm": "2024-01-21T01:00:00.000Z",

View File

@ -24,23 +24,9 @@ export const DrpRealPromise = new CachePromise(
() => fetch(`${process.env.PUBLIC_URL}/data3/drpReal.json`) () => fetch(`${process.env.PUBLIC_URL}/data3/drpReal.json`)
.then((response) => response.json()) .then((response) => response.json())
// .then(data=>{ .then(data=>{
// const cs = [] return data.filter(o=>o.state===1)
// const list = data.map((item)=>{ })
// const obj = {...item}
// const num = item.lgtd.toString()||'0.000';
// const num2 = Number(num.slice(num.length-1,num.length))
// obj.h1 = item.h1+num2
// obj.h3 = item.h3+num2*1.2
// obj.h6 = item.h6+num2*1.5
// obj.h12 = item.h12+num2*1.6
// obj.h24 = item.h24+num2*1.8
// obj.h48 = item.h48+num2*1.9
// return obj
// })
// debugger
// return list
// })
.catch(() => null), .catch(() => null),
5000 5000
); );
@ -73,24 +59,25 @@ export const SkRealPromise = new CachePromise(
.then(data => { .then(data => {
return data.map(o => ({ ...o, aRz: parseFloat((o.rz - o.fsltdz).toFixed(2)) })) return data.map(o => ({ ...o, aRz: parseFloat((o.rz - o.fsltdz).toFixed(2)) }))
}) })
.then(data=>{ // .then(data=>{
const list = data.map((item)=>{ // const list = data.map((item)=>{
const obj = {...item} // const obj = {...item}
const num = item.lgtd.toString()||'0.000'; // const num = item.lgtd.toString()||'0.000';
const num2 = Number(num.slice(num.length-1,num.length)) // const num2 = Number(num.slice(num.length-1,num.length))
obj.h1 = item.h1+num2 // obj.h1 = item.h1+num2
obj.h3 = item.h3+num2*1.2 // obj.h3 = item.h3+num2*1.2
obj.h6 = item.h6+num2*1.5 // obj.h6 = item.h6+num2*1.5
obj.h12 = item.h12+num2*1.6 // obj.h12 = item.h12+num2*1.6
obj.h24 = item.h24+num2*1.8 // obj.h24 = item.h24+num2*1.8
obj.h48 = item.h48+num2*1.9 // obj.h48 = item.h48+num2*1.9
if(obj.w<=0.5){ // if(obj.w<=0.5){
// c.push(obj) // // c.push(obj)
} // }
return obj // return obj
}) // })
return list // return list
}) // })
// .then(data=>data.filter(o=>o.rzState===1))
.catch(() => null), .catch(() => null),
5000 5000
); );

View File

@ -419,7 +419,6 @@ const map = {
ShuiyuandiQLayer:true, ShuiyuandiQLayer:true,
ShuizhiLayer:true, ShuizhiLayer:true,
ShuiyuandiLayer: true, ShuiyuandiLayer: true,
}; };
Object.keys(DCPJ_TYPES).forEach(key => { Object.keys(DCPJ_TYPES).forEach(key => {
layerVisible['Dcpj_' + key + 'Layer'] = false; layerVisible['Dcpj_' + key + 'Layer'] = false;
@ -436,6 +435,7 @@ const map = {
RoadLayer: true, RoadLayer: true,
RivlLayer: true, RivlLayer: true,
ShuichangLayer:true, ShuichangLayer:true,
ShuichangQLayer: true,
}; };
Object.keys(DCPJ_TYPES).forEach(key => { Object.keys(DCPJ_TYPES).forEach(key => {
layerVisible['Dcpj_' + key + 'Layer'] = false; layerVisible['Dcpj_' + key + 'Layer'] = false;
@ -546,10 +546,12 @@ const map = {
if (id === 306) { if (id === 306) {
dispatch.map.setLayerSetting({ dom: false }); dispatch.map.setLayerSetting({ dom: false });
map.setLayoutProperty('管网图', 'visibility', 'visible'); dispatch.runtime.setShowGw(true)
// map.setLayoutProperty('管网图', 'visibility', 'visible');
} else { } else {
dispatch.runtime.setShowGw(false)
// dispatch.map.setLayerSetting({dom: true}); // dispatch.map.setLayerSetting({dom: true});
map.setLayoutProperty('管网图', 'visibility', 'none'); // map.setLayoutProperty('管网图', 'visibility', 'none');
} }
if (id === 503 || id == 501 || id == 504 || id == 505 || id == 506 || id == 507) { if (id === 503 || id == 501 || id == 504 || id == 505 || id == 506 || id == 507) {
dispatch.map.setLayerSetting({ dom: false }); dispatch.map.setLayerSetting({ dom: false });

View File

@ -132,7 +132,7 @@ export default function calcLayout(view, rightStack, hidePanels) {
left = [ left = [
{ key: '天气' }, { key: '天气' },
{ key: '水厂总览', style: { height: '26rem' } }, { key: '水厂总览', style: { height: '26rem' } },
{ key: '设备统计', style: { height: '16rem' } }, { key: '设备统计', style: { height: '23rem' } },
// { key: '水厂监控',style: { height: '16rem'} }, // { key: '水厂监控',style: { height: '16rem'} },
// { key: '设备数量统计',style: { height: '18rem'} }, // { key: '设备数量统计',style: { height: '18rem'} },
// { key: '设备故障统计',style: { height: '18rem'} }, // { key: '设备故障统计',style: { height: '18rem'} },
@ -331,8 +331,8 @@ export default function calcLayout(view, rightStack, hidePanels) {
} else if (view === 301) { } else if (view === 301) {
right = [ right = [
// { key: '警报' }, // { key: '警报' },
{ key: '水厂生产情况',style: { height: '15rem', flexGrow: 1 } }, // { key: '水厂生产情况',style: { height: '15rem', flexGrow: 1 } },
{ key: '对比分析', style: { height: '19rem' } }, // { key: '对比分析', style: { height: '19rem' } },
{ key: '报警统计',style: { height: '19rem',flexGrow: 1 } }, { key: '报警统计',style: { height: '19rem',flexGrow: 1 } },
]; ];
} else if (view === 302) { } else if (view === 302) {

View File

@ -56,6 +56,7 @@ function initState() {
"rzState": 1, "rzState": 1,
"aRz": -4.18 "aRz": -4.18
}, },
showGw:false,
} }
} }
@ -89,6 +90,9 @@ const runtime = {
setSkObj(state, props) { setSkObj(state, props) {
return { ...state, skObj: props } return { ...state, skObj: props }
}, },
setShowGw(state, props) {
return { ...state, showGw: props }
},
setLogoDisplaying(state, val) { setLogoDisplaying(state, val) {
return { ...state, logoDisplaying: val } return { ...state, logoDisplaying: val }
}, },

View File

@ -35,7 +35,7 @@ function HDStDlg({ record, onClose }) {
BackdropComponent={DpBackgroundDrop} BackdropComponent={DpBackgroundDrop}
> >
<div className="boxhead"></div> <div className="boxhead"></div>
<DialogContent style={{ padding: 0, width: '60rem', overflowX: 'hidden',height:'35rem' }}> <DialogContent style={{ padding: 0, width: '60rem', overflowX: 'hidden' }}>
<DpAppBar position="sticky"> <DpAppBar position="sticky">
<DpTabs value={value} indicatorColor="primary" onChange={(_, v) => setValue(v)}> <DpTabs value={value} indicatorColor="primary" onChange={(_, v) => setValue(v)}>
<DpTab label="资产详情" /> <DpTab label="资产详情" />
@ -46,12 +46,13 @@ function HDStDlg({ record, onClose }) {
{ {
value===0? value===0?
<div style={{padding:10}}> <div style={{padding:0}}>
<img src={`${process.env.PUBLIC_URL}/assets/资产详情.jpg`} style={{width:'100%'}}></img> <img src={`${process.env.PUBLIC_URL}/assets/资产详情.jpg`} style={{width:'100%'}}></img>
</div>:null </div>:null
} }
{ {
value===1? value===1?
<div style={{height:'35rem'}}>
<TableContainer > <TableContainer >
<Table size="small" stickyHeader> <Table size="small" stickyHeader>
<TableHead> <TableHead>
@ -83,6 +84,7 @@ function HDStDlg({ record, onClose }) {
</TableBody> </TableBody>
</Table> </Table>
</TableContainer> </TableContainer>
</div>
:null :null
} }
</DialogContent> </DialogContent>

View File

@ -17,11 +17,13 @@ import DpCloseButton from '../../../../layouts/mui/DpCloseButton';
import ZrrPlan from './zrrPlan' import ZrrPlan from './zrrPlan'
import Shuizhijc from './loushun' import Shuizhijc from './loushun'
import Jianceflow from './jianceflow' import Jianceflow from './jianceflow'
import Yxsj from './yxsj'
import Spjk from './spjk' import Spjk from './spjk'
import Bjjl from './Bjjl' import Bjjl from './Bjjl'
import Jbxx from './jbxx'
import './index.less' import './index.less'
function SkDlg({ record, onClose }) { function SkDlg({ record, onClose }) {
const [value, setValue] = React.useState(0); const [value, setValue] = React.useState(0);
@ -47,8 +49,8 @@ function SkDlg({ record, onClose }) {
<DpCloseButton onClick={onClose} /> <DpCloseButton onClick={onClose} />
</DpAppBar> </DpAppBar>
<div style={{ padding: '2rem', height: '50rem' }}> <div style={{ padding: '2rem', height: '50rem' }}>
{value === 0 && <ShuiyuandiInfo record={record} />} {value === 0 && <Jbxx record={record} />}
{value === 1 && <Shuizhijc record={record} />} {value === 1 && <Yxsj record={record} />}
{value === 2 && <Bjjl record={record} />} {value === 2 && <Bjjl record={record} />}
{value === 3 && <Shuizhijc record={record} />} {value === 3 && <Shuizhijc record={record} />}
</div> </div>

View File

@ -0,0 +1,32 @@
import { Grid } from '@material-ui/core';
import React from 'react';
import useRequest from '../../../../utils/useRequest';
import { skInfo } from '../../../../models/_/search';
import { adnmCun, adnmZhen } from '../../../../models/_/adcd';
import { Person } from '@material-ui/icons';
import DescriptionItem from '../../components/DescrptionItem';
function SkInfo({ record }) {
let { data } = useRequest(() => skInfo(record));
data = data || {};
return (
<div>
<Grid container size="small">
<DescriptionItem label="管网编号">{'H24810001'}</DescriptionItem>
<DescriptionItem label="建设年代">{'2020-10-12'}</DescriptionItem>
<DescriptionItem label="是否主管网">{'否'}</DescriptionItem>
<DescriptionItem label="上下游连接节点">{'否'}</DescriptionItem>
<DescriptionItem label="管径">{1.4}</DescriptionItem>
<DescriptionItem label="供水村镇">{}</DescriptionItem>
<DescriptionItem label="管道长度">{}</DescriptionItem>
<DescriptionItem label="供水户数">{}</DescriptionItem>
</Grid>
</div>
)
}
export default SkInfo;

View File

@ -0,0 +1,64 @@
import { Grid } from '@material-ui/core';
import React from 'react';
import Table from '@material-ui/core/Table';
import TableContainer from '@material-ui/core/TableContainer';
import TableBody from '@material-ui/core/TableBody';
import TableHead from '@material-ui/core/TableHead';
import TableRow from '@material-ui/core/TableRow';
import DpTableCell from '../../../../layouts/mui/DpTableCell';
import DpTableRow from '../../../../layouts/mui/DpTableRow';
import moment from 'moment';
function SkInfo({ record }) {
const data = [
{ stnm: '福田镇中心区', leakage: '1258.6', supply: '3526.8', rate: 35.6 },
{ stnm: '木子店镇区', leakage: '986.3', supply: '2832.7', rate: 34.8 },
{ stnm: '龙池桥镇区', leakage: '1485.5', supply: '4482.5', rate: 33.1 },
{ stnm: '宋埠镇区', leakage: '1284.8', supply: '4029.5', rate: 31.9 },
{ stnm: '黄土岗镇区', leakage: '186.2', supply: '698.2', rate: 26.7 },
{ stnm: '铁门岗镇区', leakage: '984.2', supply: '3994.4', rate: 24.6 },
{ stnm: '乘马岗镇区', leakage: '300.6', supply: '1250.5', rate: 24.0 },
{ stnm: '白果镇区', leakage: '1129.0', supply: '6422.6', rate: 17.6 },
{ stnm: '张家畈镇区', leakage: '444.8', supply: '2661.8', rate: 16.7 },
{ name: '顺河镇区', leakage: '749.3', supply: '4490.1', rate: 16.7 }
];
return (
<div>
<TableContainer style={{ height: '80%', marginTop: '10px' }}>
<Table size="small" stickyHeader>
<TableHead>
<TableRow >
<DpTableCell style={{ minWidth: '4rem' }} align="center">序号</DpTableCell>
<DpTableCell style={{ minWidth: '4rem' }} align="center">压力</DpTableCell>
<DpTableCell style={{ minWidth: '4rem' }} align="center">流量()</DpTableCell>
<DpTableCell align="center" style={{ minWidth: '4rem' }}>水质</DpTableCell>
<DpTableCell align="center" style={{ minWidth: '4rem' }}>监测时间</DpTableCell>
</TableRow>
</TableHead>
<TableBody>
{data.map((row,i) => (
<DpTableRow key={row.id}>
<DpTableCell align="center">
<div
className="table-ellipsis cursor-pointer"
>{i+1}</div>
</DpTableCell>
<DpTableCell align="center">{row.leakage}</DpTableCell>
<DpTableCell align="center">{row.rate}</DpTableCell>
<DpTableCell align="center">{'-'}</DpTableCell>
<DpTableCell align="center">{moment().format('YYYY-MM-DD')}</DpTableCell>
{/* {rzRender(row.rz, row.grz)}
{rzRender(row.rz, row.wrz)} */}
</DpTableRow>
))}
</TableBody>
</Table>
</TableContainer>
</div>
)
}
export default SkInfo;

View File

@ -45,8 +45,8 @@ function SkDlg({ record, onClose }) {
<DpCloseButton onClick={onClose} /> <DpCloseButton onClick={onClose} />
</DpAppBar> </DpAppBar>
<div style={{ padding: '2rem', height: '50rem' }}> <div style={{ padding: '2rem', height: '50rem' }}>
{value === 0 && <DrpSearch record={record} />} {value === 0 && <DrpSearch record={{...record,tm:record.rzTm}} />}
{value === 1 && <RzSearch record={record} />} {value === 1 && <RzSearch record={{...record,tm:record.rzTm}} />}
{value === 2 && <SkImgSearch record={record} />} {value === 2 && <SkImgSearch record={record} />}
{value === 3 && <SkInfo record={record} />} {value === 3 && <SkInfo record={record} />}
{value === 4 && <ZrrPlan />} {value === 4 && <ZrrPlan />}

View File

@ -204,7 +204,7 @@ function DrpChart({ record }) {
const classes = useStyles(); const classes = useStyles();
const tm = [moment().add(-24, 'hour'), moment()]; const tm = [moment().add(-24, 'hour'), moment()];
const resultTm = ['2025-06-07 10:00:00','2025-06-08 10:00:00']//normalizeSearchTmRange(tm, 'h'); const resultTm = [moment(record.tm).add(-1,'days').format('YYYY-MM-DD HH:00:00'),moment(record.tm).format('YYYY-MM-DD HH:00:00')]//normalizeSearchTmRange(tm, 'h');
useEffect(() => { useEffect(() => {
drpSearch(record.type, record.stcd, 'h', resultTm, record.countycode).then((data) => { drpSearch(record.type, record.stcd, 'h', resultTm, record.countycode).then((data) => {
@ -378,9 +378,9 @@ function DrpChart({ record }) {
option={option} option={option}
style={{ height: '15rem', width: '30rem' }} style={{ height: '15rem', width: '30rem' }}
/> />
<div className={classes.grid}> <div className={classes.grid} >
{/* <Typography variant="subtitle2">上报时间: {record.tm ? moment(record.tm).format('YYYY-MM-DD HH:mm:ss') : '-'}</Typography> */} <Typography variant="subtitle2" style={{color:"#ffffff"}}>上报时间: {record.tm ? moment(record.tm).format('YYYY-MM-DD HH:mm:ss') : '-'}</Typography>
{/* <div className={classes.realdrpgrid}> <div className={classes.realdrpgrid}>
{ {
['h1', 'h3', 'h6', 'h12', 'h24'].map(key => ( ['h1', 'h3', 'h6', 'h12', 'h24'].map(key => (
<div key={key} className="item"> <div key={key} className="item">
@ -389,7 +389,7 @@ function DrpChart({ record }) {
</div> </div>
)) ))
} }
</div> */} </div>
</div> </div>
</> </>
) )

View File

@ -9,9 +9,9 @@ function RealDrpTip({ record, dispatch }) {
const [type, setType] = useState('drp'); const [type, setType] = useState('drp');
const changeView = () => { // const changeView = () => {
setType(type === 'drp' ? 'rz' : 'drp'); // setType(type === 'drp' ? 'rz' : 'drp');
} // }
const viewInfo = () => { const viewInfo = () => {
dispatch?.runtime.setInfoDlg({ layerId: 'RealDrpLayer', properties: record }) dispatch?.runtime.setInfoDlg({ layerId: 'RealDrpLayer', properties: record })
@ -26,7 +26,7 @@ function RealDrpTip({ record, dispatch }) {
<div className="extra cursor-pointer" onClick={viewInfo}>详细</div> <div className="extra cursor-pointer" onClick={viewInfo}>详细</div>
</div> </div>
{type === 'drp' ? <DrpChart record={record} /> : null} {type === 'drp' ? <DrpChart record={record} /> : null}
{type === 'rz' ? <HDChart record={record} /> : null} {/* {type === 'rz' ? <HDChart record={record} /> : null} */}
<div className="boxfoot"></div> <div className="boxfoot"></div>
</> </>
) )

View File

@ -28,8 +28,8 @@ function HDChart({ record }) {
const [data, setData] = useState([]); const [data, setData] = useState([]);
const tm = [moment().add(-24, 'hour'), moment()]; const tm = [moment().add(-24, 'hour'), moment()];
const resultTm = normalizeSearchTmRange(tm, 'h'); // const resultTm = normalizeSearchTmRange(tm, 'h');
const resultTm = [moment(record.tm).add(-1,'days').format('YYYY-MM-DD HH:00:00'),moment(record.tm).format('YYYY-MM-DD HH:00:00')]//normalizeSearchTmRange(tm, 'h');
useEffect(() => { useEffect(() => {
rzSearch(record.type, record.stcd, 'h', resultTm, record.countycode).then((data) => { rzSearch(record.type, record.stcd, 'h', resultTm, record.countycode).then((data) => {
setData(data || []); setData(data || []);
@ -196,9 +196,9 @@ function HDChart({ record }) {
style={{ height: '15rem', width: '30rem' }} style={{ height: '15rem', width: '30rem' }}
/> />
<div className={classes.grid}> <div className={classes.grid}>
<Typography variant="subtitle2" style={{color:"#fff"}}>上报时间: {rtm ? moment(rtm).format('YYYY-MM-DD HH:mm:ss') : '-'}</Typography> <Typography variant="subtitle2" style={{color:'#ffffff'}}>上报时间: {rtm ? moment(rtm).format('YYYY-MM-DD HH:mm:ss') : '-'}</Typography>
<div className={classes.realdrpgrid}> {/* <div className={classes.realdrpgrid}>
<div className="item" > <div className="item">
<Typography variant="caption">水位</Typography> <Typography variant="caption">水位</Typography>
<Typography variant="h5" style={{color:"#fff"}}>{renderHDRz(record)}</Typography> <Typography variant="h5" style={{color:"#fff"}}>{renderHDRz(record)}</Typography>
</div> </div>
@ -214,7 +214,7 @@ function HDChart({ record }) {
<Typography variant="caption">保证水位</Typography> <Typography variant="caption">保证水位</Typography>
<Typography variant="h5" style={{color:"#fff"}}>{record.grz || '--'}</Typography> <Typography variant="h5" style={{color:"#fff"}}>{record.grz || '--'}</Typography>
</div> </div>
</div> </div> */}
</div> </div>
</> </>
) )

View File

@ -130,6 +130,10 @@ export default function MapCtrl({ initParams, onLoad }) {
const record = feature.properties const record = feature.properties
dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: record, coordinates: [record.lgtd, record.lttd] }); dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: record, coordinates: [record.lgtd, record.lttd] });
} }
if(feature.layer.id==='关联站点'){
const record = feature.properties
// dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: record, coordinates: [record.lgtd, record.lttd] });
}
} }
}); });

View File

@ -50,7 +50,11 @@ const Style = {
], ],
'icon-size': [ 'icon-size': [
'interpolate', ['linear'], ['zoom'], 'interpolate', ['linear'], ['zoom'],
10, ['case', ['==', ['get', 'rzWarning'], 1], 0.6, 0.3], 10,
['case',
['!=', ['get', 'rzState'], 1], 0.4,
['==', ['get', 'rzWarning'], 1], 0.7,
0.7],
14, 0.7, 14, 0.7,
], ],
'text-size': [ 'text-size': [

View File

@ -188,8 +188,8 @@ function DrpSearch({ record }) {
"year": "2025" "year": "2025"
} }
] ]
const [stm, handleDateChange1] = useState(() => moment().add(-1, 'd')); const [stm, handleDateChange1] = useState(() => moment(record.tm).add(-1, 'd'));
const [etm, handleDateChange2] = useState(() => moment()); const [etm, handleDateChange2] = useState(() => moment(record.tm));
const [data, setData] = useState([]); const [data, setData] = useState([]);
const searchTm = useMemo(() => { const searchTm = useMemo(() => {

View File

@ -13,8 +13,8 @@ import { backgroundColor } from 'echarts/lib/theme/dark';
function RzSearch({ record }) { function RzSearch({ record }) {
console.log('r', record); console.log('r', record);
const [selectedDate1, handleDateChange1] = useState(() => moment().add(-1, 'd')); const [selectedDate1, handleDateChange1] = useState(() => moment(record.tm).add(-1, 'd'));
const [selectedDate2, handleDateChange2] = useState(() => moment()); const [selectedDate2, handleDateChange2] = useState(() => moment(record.tm));
const [data, setData] = useState([]); const [data, setData] = useState([]);
const searchTm = useMemo(() => { const searchTm = useMemo(() => {

View File

@ -22,6 +22,7 @@ export default function Demo1() {
const yyRes = useSelector(s => s.runtime.yyObj); const yyRes = useSelector(s => s.runtime.yyObj);
const isSc = useSelector(s => s.runtime.scya); const isSc = useSelector(s => s.runtime.scya);
const wg = useSelector(s => s.runtime.shkshObj) const wg = useSelector(s => s.runtime.shkshObj)
const showGw = useSelector(s => s.runtime.showGw)
console.log('wg', wg); console.log('wg', wg);
@ -49,6 +50,12 @@ export default function Demo1() {
isSc && <img src={`${process.env.PUBLIC_URL}/assets/scdd.jpg`} alt="" style={{ zIndex: 0.1, position: 'absolute', width: '100%' }} /> isSc && <img src={`${process.env.PUBLIC_URL}/assets/scdd.jpg`} alt="" style={{ zIndex: 0.1, position: 'absolute', width: '100%' }} />
} */} } */}
{
showGw && <img src={`${process.env.PUBLIC_URL}/assets/管网.png`} alt="" style={{ zIndex: 0.1, position: 'absolute', width: '100vw',height:'101vh' }} />
}
<div className="bottom"> <div className="bottom">
<ActionDock /> <ActionDock />

View File

@ -85,7 +85,7 @@ const data = [
const AreaDrpChart = () => { const AreaDrpChart = ({rz}) => {
@ -121,7 +121,7 @@ const AreaDrpChart = () => {
xAxis: [ xAxis: [
{ {
type: 'category', type: 'category',
// data: x, data: data.map((o)=>o[0]),
splitLine: { splitLine: {
show: true, //隐藏X轴轴线 show: true, //隐藏X轴轴线
lineStyle: { lineStyle: {
@ -182,7 +182,7 @@ const AreaDrpChart = () => {
axisTick: { axisTick: {
show: false, show: false,
}, },
min: 133, // min: 133,
// max: 135, // max: 135,
} }
], ],
@ -191,7 +191,7 @@ const AreaDrpChart = () => {
name: '水位', name: '水位',
type: 'line', type: 'line',
barWidth: 10, barWidth: 10,
data: data, data: data.map(o=>rz),
showSymbol: false, showSymbol: false,
itemStyle: { itemStyle: {
normal: { normal: {
@ -212,7 +212,7 @@ const AreaDrpChart = () => {
type: 'line', type: 'line',
barWidth: 10, barWidth: 10,
showSymbol: false, showSymbol: false,
data: data.map((item)=>134.5), data: data.map(o=>rz+34.5),
itemStyle: { itemStyle: {
normal: { normal: {
color: '#f19932' color: '#f19932'
@ -232,7 +232,7 @@ const AreaDrpChart = () => {
type: 'line', type: 'line',
barWidth: 10, barWidth: 10,
showSymbol: false, showSymbol: false,
data: data.map((item)=>134.8), data: data.map(o=>rz+45.2),
itemStyle: { itemStyle: {
normal: { normal: {
color: '#e1554e' color: '#e1554e'

View File

@ -9,6 +9,7 @@ import config from '../../../../config';
function DrpReal({ style }) { function DrpReal({ style }) {
const [dimension, setDimension] =useState('61614460'); const [dimension, setDimension] =useState('61614460');
const [rz,setRz] = useState(21.91)
const dispatch = useDispatch(); const dispatch = useDispatch();
const data = [ const data = [
{ {
@ -157,6 +158,7 @@ function DrpReal({ style }) {
const value = event.target.value; const value = event.target.value;
setDimension(value); setDimension(value);
const record = data.filter(o=>o.stcd===value)[0] const record = data.filter(o=>o.stcd===value)[0]
setRz(record.rz)
const { lgtd, lttd } = record; const { lgtd, lttd } = record;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: 'RealHDPop', properties: record, coordinates: [lgtd, lttd] }); dispatch.runtime.setFeaturePop({ type: 'RealHDPop', properties: record, coordinates: [lgtd, lttd] });
@ -167,18 +169,6 @@ function DrpReal({ style }) {
}); });
} }
}} }}
// sx={{
// color: '#fff',
// '.MuiOutlinedInput-notchedOutline': {
// borderColor: 'rgba(255, 255, 255, 0.3)',
// },
// '&:hover .MuiOutlinedInput-notchedOutline': {
// borderColor: 'rgba(255, 255, 255, 0.6)',
// },
// '&.Mui-focused .MuiOutlinedInput-notchedOutline': {
// borderColor: '#fff',
// }
// }}
> >
{ {
data.map((item)=> data.map((item)=>
@ -190,7 +180,7 @@ function DrpReal({ style }) {
</> </>
} }
> >
<AreaDrpChart data={[]} /> <AreaDrpChart data={[]} rz={rz}/>
</PanelBox> </PanelBox>
) )
} }

View File

@ -711,8 +711,8 @@ const data5 = [
"town_nm": "阎家河镇", "town_nm": "阎家河镇",
"res_cd": "42118140028", "res_cd": "42118140028",
"res_nm": "红心水库", "res_nm": "红心水库",
"res_lon": 115.18962, "lgtd": 115.18962,
"res_lat": 31.23425, "lttd": 31.23425,
"video_guid": "00032e3e6d984f0eb32c807e5769ec3a", "video_guid": "00032e3e6d984f0eb32c807e5769ec3a",
"video_name": "红心水库坝脚球机", "video_name": "红心水库坝脚球机",
"online": "1", "online": "1",
@ -727,8 +727,8 @@ const data5 = [
"town_nm": "龙池办事处", "town_nm": "龙池办事处",
"res_cd": "42118150152", "res_cd": "42118150152",
"res_nm": "戴家冲水库", "res_nm": "戴家冲水库",
"res_lon": 115.0241, "lgtd": 115.0241,
"res_lat": 31.23237, "lttd": 31.23237,
"video_guid": "0037a5cb2caf44e49c012e3fdfa01238", "video_guid": "0037a5cb2caf44e49c012e3fdfa01238",
"video_name": "戴家冲水库_坝顶_枪机_龙池", "video_name": "戴家冲水库_坝顶_枪机_龙池",
"online": "1", "online": "1",
@ -743,8 +743,8 @@ const data5 = [
"town_nm": "宋埠镇", "town_nm": "宋埠镇",
"res_cd": "42118140008", "res_cd": "42118140008",
"res_nm": "管山水库", "res_nm": "管山水库",
"res_lon": 114.78397, "lgtd": 114.78397,
"res_lat": 31.19451, "lttd": 31.19451,
"video_guid": "0243e9726e244b728618741f248e0577", "video_guid": "0243e9726e244b728618741f248e0577",
"video_name": "管山水库坝脚球机", "video_name": "管山水库坝脚球机",
"online": "1", "online": "1",
@ -759,8 +759,8 @@ const data5 = [
"town_nm": "中馆驿镇", "town_nm": "中馆驿镇",
"res_cd": "42118140005", "res_cd": "42118140005",
"res_nm": "响鼓墩水库", "res_nm": "响鼓墩水库",
"res_lon": 114.91971, "lgtd": 114.91971,
"res_lat": 31.17985, "lttd": 31.17985,
"video_guid": "024eaf5578464d9192559ad2288ba764", "video_guid": "024eaf5578464d9192559ad2288ba764",
"video_name": "响鼓墩水库", "video_name": "响鼓墩水库",
"online": "1", "online": "1",
@ -775,8 +775,8 @@ const data5 = [
"town_nm": "福田河镇", "town_nm": "福田河镇",
"res_cd": "42118150147", "res_cd": "42118150147",
"res_nm": "张家河水库", "res_nm": "张家河水库",
"res_lon": 115.17869, "lgtd": 115.17869,
"res_lat": 31.48587, "lttd": 31.48587,
"video_guid": "02d77364354a4f8982ad3d949e0d32ab", "video_guid": "02d77364354a4f8982ad3d949e0d32ab",
"video_name": "张家河水库_坝脚_球机", "video_name": "张家河水库_坝脚_球机",
"online": "1", "online": "1",
@ -791,8 +791,8 @@ const data5 = [
"town_nm": "顺河镇", "town_nm": "顺河镇",
"res_cd": "42118150048", "res_cd": "42118150048",
"res_nm": "孙家榜水库", "res_nm": "孙家榜水库",
"res_lon": 114.91758, "lgtd": 114.91758,
"res_lat": 31.26933, "lttd": 31.26933,
"video_guid": "03059577c270432bb7338e7f714b9a01", "video_guid": "03059577c270432bb7338e7f714b9a01",
"video_name": "孙家塝水库", "video_name": "孙家塝水库",
"online": "1", "online": "1",
@ -807,8 +807,8 @@ const data5 = [
"town_nm": "三河口镇", "town_nm": "三河口镇",
"res_cd": "42118150145", "res_cd": "42118150145",
"res_nm": "袁家冲水库", "res_nm": "袁家冲水库",
"res_lon": 115.28076, "lgtd": 115.28076,
"res_lat": 31.28639, "lttd": 31.28639,
"video_guid": "031ac395df964414a17f9dc996e13d57", "video_guid": "031ac395df964414a17f9dc996e13d57",
"video_name": "袁家冲水库视频站", "video_name": "袁家冲水库视频站",
"online": "1", "online": "1",
@ -823,8 +823,8 @@ const data5 = [
"town_nm": "南湖办事处", "town_nm": "南湖办事处",
"res_cd": "42118140003", "res_cd": "42118140003",
"res_nm": "毛家冲水库", "res_nm": "毛家冲水库",
"res_lon": 114.98531, "lgtd": 114.98531,
"res_lat": 31.20469, "lttd": 31.20469,
"video_guid": "036b290ac8e547a79f5835754e02772c", "video_guid": "036b290ac8e547a79f5835754e02772c",
"video_name": "毛家冲水库溢洪道", "video_name": "毛家冲水库溢洪道",
"online": "1", "online": "1",
@ -839,8 +839,8 @@ const data5 = [
"town_nm": "歧亭镇", "town_nm": "歧亭镇",
"res_cd": "42118150224", "res_cd": "42118150224",
"res_nm": "兴隆寺水库", "res_nm": "兴隆寺水库",
"res_lon": 114.69534, "lgtd": 114.69534,
"res_lat": 31.01031, "lttd": 31.01031,
"video_guid": "0385335df9c64c1f8972cf3ed17b4854", "video_guid": "0385335df9c64c1f8972cf3ed17b4854",
"video_name": "兴隆寺水库_坝脚_球机", "video_name": "兴隆寺水库_坝脚_球机",
"online": "1", "online": "1",
@ -855,8 +855,8 @@ const data5 = [
"town_nm": "中馆驿镇", "town_nm": "中馆驿镇",
"res_cd": "42118150094", "res_cd": "42118150094",
"res_nm": "西冲水库", "res_nm": "西冲水库",
"res_lon": 114.94118, "lgtd": 114.94118,
"res_lat": 31.06765, "lttd": 31.06765,
"video_guid": "046336873b8a4eefbc321bd2e6e4359c", "video_guid": "046336873b8a4eefbc321bd2e6e4359c",
"video_name": "西冲水库", "video_name": "西冲水库",
"online": "1", "online": "1",
@ -897,6 +897,15 @@ function DrpReal({ style }) {
if(tab==='2'&&hdData){ if(tab==='2'&&hdData){
setLayer(hdData,'hd') setLayer(hdData,'hd')
} }
if(tab==='3'&&data3){
setLayer(data3,'ll')
}
if(tab==='4'&&data4){
setLayer(data4,'tx')
}
if(tab==='5'&&data5){
setLayer(data5,'sk')
}
}else{ }else{
const dsq = setInterval(() => { const dsq = setInterval(() => {
const map = window.__mapref; const map = window.__mapref;
@ -1065,6 +1074,137 @@ function DrpReal({ style }) {
'visibility': 'visible', 'visibility': 'visible',
}); });
} }
if(type==='ll'){
map.addLayer({
'id': '关联站点',//+new Date().getTime(),
'type': 'symbol',
'source': {
'type': 'geojson',
'data': {
'type': 'FeatureCollection',
'features': [],
},
},
'layout': {
'icon-allow-overlap': true,
'text-allow-overlap': true,
'icon-image': '水表',
'icon-size': [
'interpolate', ['linear'], ['zoom'],
10, 0.4,
14, 0.8,
],
'text-allow-overlap': true,
'text-size': [
'interpolate', ['linear'], ['zoom'],
10, 10,
14, 14,
],
'text-font': ['Roboto Black'],
'text-field': [
'step',
['zoom'],
'',
12, ['get', 'stnm']
],
'text-anchor': 'top',
'text-offset': [0, 1],
},
'paint': {
'text-color': '#fff'
},
'visibility': 'visible',
});
}
if(type==='tx'){
map.addLayer({
'id': '关联站点',//+new Date().getTime(),
'type': 'symbol',
'source': {
'type': 'geojson',
'data': {
'type': 'FeatureCollection',
'features': [],
},
},
'layout': {
'icon-allow-overlap': true,
'text-allow-overlap': true,
'icon-image': '图像站',
'icon-size': [
'interpolate', ['linear'], ['zoom'],
10, 0.4,
14, 0.8,
],
'text-allow-overlap': true,
'text-size': [
'interpolate', ['linear'], ['zoom'],
10, 10,
14, 14,
],
'text-font': ['Roboto Black'],
'text-field': [
'step',
['zoom'],
'',
12, ['get', 'stnm']
],
'text-anchor': 'top',
'text-offset': [0, 1],
},
'paint': {
'text-color': '#fff'
},
'visibility': 'visible',
});
}
if(type==='sk'){
map.addLayer({
'id': '关联站点',//+new Date().getTime(),
'type': 'symbol',
'source': {
'type': 'geojson',
'data': {
'type': 'FeatureCollection',
'features': [],
},
},
'layout': {
'icon-allow-overlap': true,
'text-allow-overlap': true,
'icon-image': '水库-离线',
'icon-size': [
'interpolate', ['linear'], ['zoom'],
10, 0.4,
14, 0.8,
],
'text-allow-overlap': true,
'text-size': [
'interpolate', ['linear'], ['zoom'],
10, 10,
14, 14,
],
'text-font': ['Roboto Black'],
'text-field': [
'step',
['zoom'],
'',
12, ['get', 'stnm']
],
'text-anchor': 'top',
'text-offset': [0, 1],
},
'paint': {
'text-color': '#fff'
},
'visibility': 'visible',
});
}
map.getSource('关联站点').setData(parseGeoJSON(data)) map.getSource('关联站点').setData(parseGeoJSON(data))
} }
@ -1186,8 +1326,9 @@ function DrpReal({ style }) {
{/* <DpTableCell align="center">{index+1}</DpTableCell> */} {/* <DpTableCell align="center">{index+1}</DpTableCell> */}
<DpTableCell component="th" scope="row"> <DpTableCell component="th" scope="row">
<div className="table-ellipsis cursor-pointer" onClick={() => { <div className="table-ellipsis cursor-pointer" onClick={() => {
const { res_lon:lgtd, res_lat:lttd } = row; const { lgtd, lttd } = row;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: '流量水表站', properties: row, coordinates: [row.lgtd, row.lttd] });
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [lgtd, lttd], center: [lgtd, lttd],
zoom: 15, zoom: 15,
@ -1221,8 +1362,9 @@ function DrpReal({ style }) {
<DpTableCell align="center">{index+1}</DpTableCell> <DpTableCell align="center">{index+1}</DpTableCell>
<DpTableCell component="th" scope="row"> <DpTableCell component="th" scope="row">
<div className="table-ellipsis cursor-pointer" style={{marginLeft:'20px'}} onClick={() => { <div className="table-ellipsis cursor-pointer" style={{marginLeft:'20px'}} onClick={() => {
const { res_lon:lgtd, res_lat:lttd } = row; const { lgtd, lttd } = row;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: 'PicStPop', properties: row, coordinates: [row.lgtd, row.lttd] });
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [lgtd, lttd], center: [lgtd, lttd],
zoom: 15, zoom: 15,
@ -1255,8 +1397,9 @@ function DrpReal({ style }) {
<DpTableCell align="center">{index+1}</DpTableCell> <DpTableCell align="center">{index+1}</DpTableCell>
<DpTableCell component="th" scope="row"> <DpTableCell component="th" scope="row">
<div className="table-ellipsis cursor-pointer" style={{marginLeft:'20px'}} onClick={() => { <div className="table-ellipsis cursor-pointer" style={{marginLeft:'20px'}} onClick={() => {
const { res_lon:lgtd, res_lat:lttd } = row; const { lgtd, lttd } = row;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: row, coordinates: [row.lgtd, row.lttd] });
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [lgtd, lttd], center: [lgtd, lttd],
zoom: 15, zoom: 15,

View File

@ -157,7 +157,7 @@ const AreaDrpChart = ({index}) => {
name: '实际产水', name: '实际产水',
type: 'line', type: 'line',
barWidth: 10, barWidth: 10,
data: y.map((item)=>item*(index+1)*1.1), data: y.map((item)=>item*index),
showSymbol: false, showSymbol: false,
itemStyle: { itemStyle: {
normal: { normal: {

View File

@ -8,136 +8,171 @@ import config from '../../../../config';
function DrpReal({ style }) { function DrpReal({ style }) {
const [dimension, setDimension] =useState('61614460'); const [dimension, setDimension] =useState(1);
const [index,setIndex ] = useState(0) const [index,setIndex ] = useState(1)
const dispatch = useDispatch(); const dispatch = useDispatch();
const data = [ const data = [
{ {
"stcd": "61614460", "stcd": "61614200",
"stnm": "项生(宋埠)", "type": "sk",
"adcd": "421181000000000", "hasRz": true,
"stnm": "浮桥河水厂",
zb: '浊度',
index:1,
yjvalue: 0.6,
status:1,
"adcd": "421181100000",
"wscd": null, "wscd": null,
"importancy": 0, "importancy": 0,
"lgtd": 114.798056, "lgtd": 114.875,
"lttd": 31.058611, "lttd": 31.166667,
"elev": null, "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,
percent: 98.20
},
{
"stcd": "61612610",
index:1.1,
"type": "sk",
"hasRz": true, "hasRz": true,
"wrz": null, "stnm": "三河口水厂",
"wrq": null, zb: '余氯',
"grz": null, yjvalue: 0.25,
"grq": null, "adcd": "421181109000",
"sfz": null, "wscd": null,
"sfq": null, percent: 94.29,
"type": "sh", "importancy": 0,
"tm": "2025-06-03T02:00:00.000Z", "lgtd": 115.166667,
"rz": 21.91, "lttd": 31.333333,
"trend": 1, "elev": 0,
"state": 1, "damel": 156.8,
"warning": 0, "dsflz": 154.99,
"maxRz": 21.91, "fsltdz": 149,
"maxDate": "2025-06-03T02:00:00.000Z", "ddz": 124,
"warndes": null "zcxsw": 149,
},{ "drpTm": "2025-06-03T02:00:00.000Z",
"stcd": "61613700", "today": 0,
"stnm": "四角门(宋铁二桥)", "h1": 0,
"adcd": "421181000000000", "h3": 0,
"h6": 0,
"h12": 0,
"h24": 0,
"h48": 12.5,
"drpState": 1,
"rz": 141.45,
"w": 77.8,
"a_fsltdz": -7.550000000000011,
"rzTm": "2025-06-03T01:00:00.000Z",
"rzWarning": 0,
"rzState": 1,
"aRz": -7.55
},
{
"stcd": "7CS000231",
"type": "sk",
index:1.2,
"hasRz": true,
"stnm": "刘集水厂",
zb: 'PH值',
yjvalue: 7.4,
percent: 56.98,
"adcd": "421181100000",
"wscd": null, "wscd": null,
"importancy": 0, "importancy": 0,
"lgtd": 114.8291, "lgtd": 115.048056,
"lttd": 31.0754, "lttd": 31.335556,
"elev": null, "elev": 0,
"damel": 79.6,
"dsflz": 78.65,
"fsltdz": 72.05,
"ddz": 69.55,
"zcxsw": 72.05,
"drpTm": "2023-11-20T01:00:00.000Z",
"today": 0,
"h1": 0,
"h3": 0,
"h6": 0,
"h12": 0,
"h24": 0,
"h48": 0,
"drpState": 2,
"rz": 76.49,
"w": 0.049,
"a_fsltdz": 4.439999999999998,
"rzTm": "2025-04-11T06:00:00.000Z",
"rzWarning": 1,
"rzState": 2,
"pic": [
{
"stcd": "7CS000231",
"tm": "2023-11-20T01:04:18.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/1120/7CS000231/20231120090418.jpg"
},
{
"stcd": "7CS000231",
"tm": "2023-11-20T01:07:54.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/1120/7CS000232/20231120090754.jpg"
}
],
"aRz": 4.44
},
{
"stcd": "716460001",
"type": "sk",
"hasRz": true, "hasRz": true,
"wrz": null, "stnm": "杉林河水厂",
"wrq": null, index:1.3,
"grz": null, zb: 'PH值',
"grq": null, yjvalue: 6.3,
"sfz": null, "adcd": "421181107000",
"sfq": null,
"type": "sh",
"tm": "2025-06-03T02:00:00.000Z",
"rz": 27.57,
"trend": 0,
"state": 1,
"warning": 0,
"maxRz": 27.57,
"maxDate": "2025-06-03T01:00:00.000Z",
"warndes": null,
},{
"stcd": "61612910",
"stnm": "桃林河(阎河)",
"adcd": "421181000000000",
"wscd": null, "wscd": null,
percent: 42.14,
"importancy": 0, "importancy": 0,
"lgtd": 115.087777777, "lgtd": 115.433056,
"lttd": 31.164444444, "lttd": 31.304444,
"elev": null, "elev": 0,
"hasRz": true, "damel": 236.2,
"wrz": null, "dsflz": 233.92,
"wrq": null, "fsltdz": 231,
"grz": null, "ddz": 204,
"grq": null, "zcxsw": 231,
"sfz": null, "drpTm": "2025-04-11T05:00:00.000Z",
"sfq": null, "today": 0,
"type": "sh", "h1": 0,
"tm": "2025-06-03T02:35:00.000Z", "h3": 0,
"rz": 55.67, "h6": 0,
"trend": 0, "h12": 0,
"state": 1, "h24": 0,
"warning": 0, "h48": 0,
"maxRz": 55.67, "drpState": 2,
"maxDate": "2025-06-03T02:00:00.000Z", "rz": 224.31,
"warndes": null "w": 0,
},{ "a_fsltdz": -6.689999999999998,
"stcd": "61615110", "rzTm": "2025-04-11T05:00:00.000Z",
"stnm": "杨梅河(木子店)", "rzWarning": 0,
"adcd": "421181000000000", "rzState": 2,
"wscd": null, "aRz": -6.69
"importancy": 0, },
"lgtd": 115.339667,
"lttd": 31.1595,
"elev": null,
"hasRz": true,
"wrz": null,
"wrq": null,
"grz": null,
"grq": null,
"sfz": null,
"sfq": null,
"type": "sh",
"tm": "2025-06-03T02:00:00.000Z",
"rz": 112.71,
"trend": 0,
"state": 1,
"warning": 0,
"maxRz": 112.71,
"maxDate": "2025-06-02T22:00:00.000Z",
"warndes": null
},{
"stcd": "61612150",
"stnm": "鹰山畈(黄土岗)",
"adcd": "421181000000000",
"wscd": null,
"importancy": 0,
"lgtd": 115.073611,
"lttd": 31.386667,
"elev": null,
"hasRz": true,
"wrz": null,
"wrq": null,
"grz": null,
"grq": null,
"sfz": null,
"sfq": null,
"type": "sh",
"tm": "2025-06-03T02:00:00.000Z",
"rz": 77.12,
"trend": 0,
"state": 1,
"warning": 0,
"maxRz": 77.25,
"maxDate": "2025-06-02T16:00:00.000Z",
"warndes": null
},
] ]
@ -155,8 +190,8 @@ function DrpReal({ style }) {
value={dimension} value={dimension}
label="" label=""
onChange={(event,b) => { onChange={(event,b) => {
setIndex(b) const value = event.target.value;
// const value = event.target.value; setIndex(value)
// setDimension(value); // setDimension(value);
// const record = data.filter(o=>o.stcd===value)[0] // const record = data.filter(o=>o.stcd===value)[0]
// const { lgtd, lttd } = record; // const { lgtd, lttd } = record;
@ -172,7 +207,7 @@ function DrpReal({ style }) {
> >
{ {
data.map((item)=> data.map((item)=>
<MenuItem value={item.stcd}>{item.stnm}</MenuItem> <MenuItem value={item.index}>{item.stnm}</MenuItem>
) )
} }
</Select> </Select>

View File

@ -81,8 +81,8 @@ export default function OverallContent({ data }) {
dispatch.runtime.setFeaturePop({ type: poptype, properties: record, coordinates: [lgtd, lttd] }); dispatch.runtime.setFeaturePop({ type: poptype, properties: record, coordinates: [lgtd, lttd] });
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [lgtd, lttd], center: [lgtd, lttd],
zoom: 15, zoom: 13,
pitch: config.poiPitch, pitch: 30,//config.poiPitch,
}); });
} }
} }
@ -100,25 +100,25 @@ export default function OverallContent({ data }) {
}) })
} else { } else {
const obj = { const obj = {
'Q9123':{ 'Q9111':{
"stcd": "Q9123", "stcd": "Q9111",
"stnm": "下白米", "stnm": "福田河",
"adcd": null, "adcd": null,
"wscd": null, "wscd": null,
"importancy": 0, "importancy": 0,
"lgtd": 115.1217, "lgtd": 115.0944,
"lttd": 30.8992, "lttd": 31.4747,
"elev": null, "elev": null,
"hasRz": false, "hasRz": false,
"type": "qx", "type": "qx",
"today": 17.8, "today": 50.3,
"h1": 7.2, "h1": 50.2,
"h3": 14.3, "h3": 50.2,
"h6": 22.7, "h6": 50.2,
"h12": 24.2, "h12": 50.2,
"h24": 45.2, "h24": 50.3,
"h48": 123.5, "h48": 50.3,
"tm": "2025-06-08T03:00:00.000Z", "tm": "2025-06-06T22:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },

View File

@ -13,7 +13,7 @@ function DrpReal({ style }) {
</> </>
} }
> >
<img src='/assets/设备统计.jpg' style={{width:'27.5rem', height:'11rem',marginLeft:'-8px'}}/> <img src='/assets/设备统计1.jpg' style={{width:'11.5rem', height:'16rem',marginLeft:'6.5rem',marginTop:'2rem'}}/>
</PanelBox> </PanelBox>
) )
} }

View File

@ -18,104 +18,162 @@ const { RangePicker } = DatePicker;
const data1 = [ const data1 = [
{ {
"res_cd": "42118140035", "stcd": "61614200",
"res_lon": 115.14137, "type": "sk",
"res_lat": 31.55095, "hasRz": true,
"cd": "01", "stnm": "浮桥河水厂",
"cd_nm": "GN1", zb: '浊度',
"res_reg_cd": "42118140006-A4", yjvalue: 0.6,
"ch": "0+000", status:1,
"province_cd": "420000000000", "adcd": "421181100000",
"province_nm": "湖北省", "wscd": null,
"city_cd": "421100000000", "importancy": 0,
"city_nm": "黄冈市", "lgtd": 114.875,
"county_cd": "421181000000", "lttd": 31.166667,
"county_nm": "麻城市", "elev": 0,
"town_cd": "421181112000", "damel": 71.33,
"town_nm": "福田河镇", "dsflz": 68.04,
"bas_guid": "鄂东五河片区", "fsltdz": 64.89,
"eng_scal": "小1型", "ddz": 51.78,
"danger_stat": "非病险水库", "zcxsw": 64.89,
"label": "2023高标准", "drpTm": "2025-06-03T02:00:00.000Z",
"res_nm": "大堰口水库", "today": 0,
"de_value": -4.2885, "h1": 0,
"dn_value": -13.5384, "h3": 0,
"du_value": 132.4892, "h6": 0,
"de_trend": null, "h12": 0,
"dn_trend": null, "h24": 0,
"du_trend": null, "h48": 16.5,
"max_de": 1.0981, "drpState": 1,
"max_dn": -2.3255, "rz": 60.71,
"max_du": 132.4892, "w": 162.8,
"dt": "2025-05-20", "a_fsltdz": -4.18,
"is_has_data": "y" "rzTm": "2025-06-03T02:00:00.000Z",
"rzWarning": 0,
"rzState": 1,
"aRz": -4.18,
percent: 98.20
}, },
{ {
"res_cd": "42118140035", "stcd": "61612610",
"res_lon": 115.14137, "type": "sk",
"res_lat": 31.55095, "hasRz": true,
"cd": "03", "stnm": "三河口水厂",
"cd_nm": "GN3", zb: '余氯',
"res_reg_cd": "42118140006-A4", yjvalue: 0.25,
"ch": "0+000", "adcd": "421181109000",
"province_cd": "420000000000", "wscd": null,
"province_nm": "湖北省", percent: 94.29,
"city_cd": "421100000000", "importancy": 0,
"city_nm": "黄冈市", "lgtd": 115.166667,
"county_cd": "421181000000", "lttd": 31.333333,
"county_nm": "麻城市", "elev": 0,
"town_cd": "421181112000", "damel": 156.8,
"town_nm": "福田河镇", "dsflz": 154.99,
"bas_guid": "鄂东五河片区", "fsltdz": 149,
"eng_scal": "小1型", "ddz": 124,
"danger_stat": "非病险水库", "zcxsw": 149,
"label": "2023高标准", "drpTm": "2025-06-03T02:00:00.000Z",
"res_nm": "大堰口水库", "today": 0,
"de_value": -10.73, "h1": 0,
"dn_value": -9.8975, "h3": 0,
"du_value": 121.3495, "h6": 0,
"de_trend": null, "h12": 0,
"dn_trend": null, "h24": 0,
"du_trend": null, "h48": 12.5,
"max_de": 1.0981, "drpState": 1,
"max_dn": -2.3255, "rz": 141.45,
"max_du": 132.4892, "w": 77.8,
"dt": "2025-05-20", "a_fsltdz": -7.550000000000011,
"is_has_data": "y" "rzTm": "2025-06-03T01:00:00.000Z",
"rzWarning": 0,
"rzState": 1,
"aRz": -7.55
}, },
{ {
"res_cd": "42118140035", "stcd": "7CS000231",
"res_lon": 115.14137, "type": "sk",
"res_lat": 31.55095, "hasRz": true,
"cd": "02", "stnm": "刘集水厂",
"cd_nm": "GN2", zb: 'PH值',
"res_reg_cd": "42118140006-A4", yjvalue: 7.4,
"ch": "0+000", percent: 56.98,
"province_cd": "420000000000", "adcd": "421181100000",
"province_nm": "湖北省", "wscd": null,
"city_cd": "421100000000", "importancy": 0,
"city_nm": "黄冈市", "lgtd": 115.048056,
"county_cd": "421181000000", "lttd": 31.335556,
"county_nm": "麻城市", "elev": 0,
"town_cd": "421181112000", "damel": 79.6,
"town_nm": "福田河镇", "dsflz": 78.65,
"bas_guid": "鄂东五河片区", "fsltdz": 72.05,
"eng_scal": "小1型", "ddz": 69.55,
"danger_stat": "非病险水库", "zcxsw": 72.05,
"label": "2023高标准", "drpTm": "2023-11-20T01:00:00.000Z",
"res_nm": "大堰口水库", "today": 0,
"de_value": 1.0981, "h1": 0,
"dn_value": -7.0736, "h3": 0,
"du_value": 75.4661, "h6": 0,
"de_trend": null, "h12": 0,
"dn_trend": null, "h24": 0,
"du_trend": null, "h48": 0,
"max_de": 1.0981, "drpState": 2,
"max_dn": -2.3255, "rz": 76.49,
"max_du": 132.4892, "w": 0.049,
"dt": "2025-05-20", "a_fsltdz": 4.439999999999998,
"is_has_data": "y" "rzTm": "2025-04-11T06:00:00.000Z",
"rzWarning": 1,
"rzState": 2,
"pic": [
{
"stcd": "7CS000231",
"tm": "2023-11-20T01:04:18.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/1120/7CS000231/20231120090418.jpg"
},
{
"stcd": "7CS000231",
"tm": "2023-11-20T01:07:54.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/1120/7CS000232/20231120090754.jpg"
} }
],
"aRz": 4.44
},
{
"stcd": "716460001",
"type": "sk",
"hasRz": true,
"stnm": "杉林河水厂",
zb: 'PH值',
yjvalue: 6.3,
"adcd": "421181107000",
"wscd": null,
percent: 42.14,
"importancy": 0,
"lgtd": 115.433056,
"lttd": 31.304444,
"elev": 0,
"damel": 236.2,
"dsflz": 233.92,
"fsltdz": 231,
"ddz": 204,
"zcxsw": 231,
"drpTm": "2025-04-11T05:00:00.000Z",
"today": 0,
"h1": 0,
"h3": 0,
"h6": 0,
"h12": 0,
"h24": 0,
"h48": 0,
"drpState": 2,
"rz": 224.31,
"w": 0,
"a_fsltdz": -6.689999999999998,
"rzTm": "2025-04-11T05:00:00.000Z",
"rzWarning": 0,
"rzState": 2,
"aRz": -6.69
},
] ]
@ -182,19 +240,20 @@ function DrpReal({ style }) {
<DpTableRow key={row.stcd}> <DpTableRow key={row.stcd}>
<DpTableCell component="th" scope="row"> <DpTableCell component="th" scope="row">
<div className="table-ellipsis cursor-pointer" onClick={() => { <div className="table-ellipsis cursor-pointer" onClick={() => {
const { res_lon:lgtd, res_lat:lttd } = row; const { lgtd, lttd } = row;
const newLgtd = lgtd - 0.00122;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [lgtd, lttd], center: [newLgtd, lttd],
zoom: 15, zoom: 15,
pitch: 60, pitch: 60,
bearing: 0 bearing: 0
}); });
} }
}}>{row.res_nm}</div> }}>{row.stnm}</div>
</DpTableCell> </DpTableCell>
<DpTableCell align="center">{row.cd_nm}</DpTableCell> <DpTableCell align="center">{row.ddz}</DpTableCell>
<DpTableCell align="center">{row.du_value}</DpTableCell> <DpTableCell align="center">{row.zcxsw}</DpTableCell>
</DpTableRow> </DpTableRow>
))} ))}
</TableBody> </TableBody>

View File

@ -90,8 +90,8 @@ function SkReal({ style }) {
extra={ 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 style={{ marginRight: '0.5rem' }} className="ionicons image cursor-pointer" onClick={handleOpen}></i> */}
<i className="ionicons gear cursor-pointer" onClick={() => showSetting(true)}></i> {/* <i className="ionicons gear cursor-pointer" onClick={() => showSetting(true)}></i> */}
</> </>
} }
> >
@ -100,16 +100,16 @@ function SkReal({ style }) {
<TableHead> <TableHead>
<TableRow> <TableRow>
<DpTableCell style={{ maxWidth: '30%' }} align="left">名称</DpTableCell> <DpTableCell style={{ maxWidth: '30%' }} align="left">名称</DpTableCell>
<DpTableCell align="right">{appconsts.drpTtype[tableSkDrpField]}降雨</DpTableCell> <DpTableCell style={{ minWidth: '6rem' }} align="right">{appconsts.drpTtype[tableSkDrpField]}降雨</DpTableCell>
<DpTableCell align="right">水位</DpTableCell> <DpTableCell style={{ minWidth: '3rem' }} align="right">水位</DpTableCell>
<DpTableCell align="right">超汛限</DpTableCell> <DpTableCell style={{ minWidth: '4rem' }} align="right">超汛限</DpTableCell>
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
{sortedData.map((row) => ( {[...sortedData.filter(o=>o.rzState===1),...sortedData.filter(o=>o.rzState!==1)].map((row) => (
<DpTableRow key={row.stcd}> <DpTableRow key={row.stcd}>
<DpTableCell component="th" scope="row"> <DpTableCell component="th" scope="row">
<div className="table-ellipsis cursor-pointer" onClick={() => flyTo(row)}>{row.stnm}</div> <div className="table-ellipsis cursor-pointer" onClick={() => flyTo(row)}>{row.rzState===1?row.stnm:row.stnm+'(离线)'}</div>
</DpTableCell> </DpTableCell>
<DpTableCell align="right">{row['h24']}</DpTableCell> <DpTableCell align="right">{row['h24']}</DpTableCell>
<DpTableCell align="right">{row?.rz}</DpTableCell> <DpTableCell align="right">{row?.rz}</DpTableCell>

View File

@ -19,7 +19,7 @@ const palleteLen = pallete.length;
const AreaDrpChart = () => { const AreaDrpChart = ({rz}) => {
const x = [ const x = [
"2025-06-02 15:00:00", "2025-06-02 15:00:00",
"2025-06-02 16:00:00", "2025-06-02 16:00:00",
@ -189,7 +189,7 @@ const AreaDrpChart = () => {
axisTick: { axisTick: {
show: false, show: false,
}, },
min: 133, // min: 133,
// max: 135, // max: 135,
}, },
{ {
@ -232,7 +232,7 @@ const AreaDrpChart = () => {
name: '水位', name: '水位',
type: 'line', type: 'line',
barWidth: 10, barWidth: 10,
data: y, data: y.map(o=>rz),
showSymbol: false, showSymbol: false,
itemStyle: { itemStyle: {
normal: { normal: {

View File

@ -9,6 +9,7 @@ import AreaDrpChart from './chart';
function DrpReal({ style }) { function DrpReal({ style }) {
const [dimension, setDimension] =useState('61614200'); const [dimension, setDimension] =useState('61614200');
const [rz,setRz] = useState(60.71)
const dispatch = useDispatch(); const dispatch = useDispatch();
const data = [ const data = [
{ {
@ -215,6 +216,7 @@ function DrpReal({ style }) {
const value = event.target.value; const value = event.target.value;
setDimension(value); setDimension(value);
const record = data.filter(o=>o.stcd===value)[0] const record = data.filter(o=>o.stcd===value)[0]
setRz(record.rz)
const { lgtd, lttd } = record; const { lgtd, lttd } = record;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: record, coordinates: [lgtd, lttd] }); dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: record, coordinates: [lgtd, lttd] });
@ -236,7 +238,7 @@ function DrpReal({ style }) {
</> </>
} }
> >
<AreaDrpChart data={[]} /> <AreaDrpChart data={[]} rz={rz}/>
</PanelBox> </PanelBox>
) )
} }