+
:null
}
{
value===1?
+
+
:null
}
diff --git a/src/views/Home/MapCtrl/index.js b/src/views/Home/MapCtrl/index.js
index c91c996..d44fd35 100644
--- a/src/views/Home/MapCtrl/index.js
+++ b/src/views/Home/MapCtrl/index.js
@@ -130,6 +130,10 @@ export default function MapCtrl({ initParams, onLoad }) {
const record = feature.properties
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] });
+ }
}
});
diff --git a/src/views/Home/panels/FhxsSq/chart.js b/src/views/Home/panels/FhxsSq/chart.js
index 5c0a83b..de88388 100644
--- a/src/views/Home/panels/FhxsSq/chart.js
+++ b/src/views/Home/panels/FhxsSq/chart.js
@@ -85,7 +85,7 @@ const data = [
-const AreaDrpChart = () => {
+const AreaDrpChart = ({rz}) => {
@@ -121,7 +121,7 @@ const AreaDrpChart = () => {
xAxis: [
{
type: 'category',
- // data: x,
+ data: data.map((o)=>o[0]),
splitLine: {
show: true, //隐藏X轴轴线
lineStyle: {
@@ -182,7 +182,7 @@ const AreaDrpChart = () => {
axisTick: {
show: false,
},
- min: 133,
+ // min: 133,
// max: 135,
}
],
@@ -191,7 +191,7 @@ const AreaDrpChart = () => {
name: '水位',
type: 'line',
barWidth: 10,
- data: data,
+ data: data.map(o=>rz),
showSymbol: false,
itemStyle: {
normal: {
@@ -212,7 +212,7 @@ const AreaDrpChart = () => {
type: 'line',
barWidth: 10,
showSymbol: false,
- data: data.map((item)=>134.5),
+ data: data.map(o=>rz+34.5),
itemStyle: {
normal: {
color: '#f19932'
@@ -232,7 +232,7 @@ const AreaDrpChart = () => {
type: 'line',
barWidth: 10,
showSymbol: false,
- data: data.map((item)=>134.8),
+ data: data.map(o=>rz+45.2),
itemStyle: {
normal: {
color: '#e1554e'
diff --git a/src/views/Home/panels/FhxsSq/index.js b/src/views/Home/panels/FhxsSq/index.js
index 2bfe32c..b40eba6 100644
--- a/src/views/Home/panels/FhxsSq/index.js
+++ b/src/views/Home/panels/FhxsSq/index.js
@@ -9,6 +9,7 @@ import config from '../../../../config';
function DrpReal({ style }) {
const [dimension, setDimension] =useState('61614460');
+ const [rz,setRz] = useState(21.91)
const dispatch = useDispatch();
const data = [
{
@@ -157,6 +158,7 @@ function DrpReal({ style }) {
const value = event.target.value;
setDimension(value);
const record = data.filter(o=>o.stcd===value)[0]
+ setRz(record.rz)
const { lgtd, lttd } = record;
if (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)=>
@@ -190,7 +180,7 @@ function DrpReal({ style }) {
}
>
-
)
}
diff --git a/src/views/Home/panels/Glzd/index.js b/src/views/Home/panels/Glzd/index.js
index cf2d89c..db942ce 100644
--- a/src/views/Home/panels/Glzd/index.js
+++ b/src/views/Home/panels/Glzd/index.js
@@ -711,8 +711,8 @@ const data5 = [
"town_nm": "阎家河镇",
"res_cd": "42118140028",
"res_nm": "红心水库",
- "res_lon": 115.18962,
- "res_lat": 31.23425,
+ "lgtd": 115.18962,
+ "lttd": 31.23425,
"video_guid": "00032e3e6d984f0eb32c807e5769ec3a",
"video_name": "红心水库坝脚球机",
"online": "1",
@@ -727,8 +727,8 @@ const data5 = [
"town_nm": "龙池办事处",
"res_cd": "42118150152",
"res_nm": "戴家冲水库",
- "res_lon": 115.0241,
- "res_lat": 31.23237,
+ "lgtd": 115.0241,
+ "lttd": 31.23237,
"video_guid": "0037a5cb2caf44e49c012e3fdfa01238",
"video_name": "戴家冲水库_坝顶_枪机_龙池",
"online": "1",
@@ -743,8 +743,8 @@ const data5 = [
"town_nm": "宋埠镇",
"res_cd": "42118140008",
"res_nm": "管山水库",
- "res_lon": 114.78397,
- "res_lat": 31.19451,
+ "lgtd": 114.78397,
+ "lttd": 31.19451,
"video_guid": "0243e9726e244b728618741f248e0577",
"video_name": "管山水库坝脚球机",
"online": "1",
@@ -759,8 +759,8 @@ const data5 = [
"town_nm": "中馆驿镇",
"res_cd": "42118140005",
"res_nm": "响鼓墩水库",
- "res_lon": 114.91971,
- "res_lat": 31.17985,
+ "lgtd": 114.91971,
+ "lttd": 31.17985,
"video_guid": "024eaf5578464d9192559ad2288ba764",
"video_name": "响鼓墩水库",
"online": "1",
@@ -775,8 +775,8 @@ const data5 = [
"town_nm": "福田河镇",
"res_cd": "42118150147",
"res_nm": "张家河水库",
- "res_lon": 115.17869,
- "res_lat": 31.48587,
+ "lgtd": 115.17869,
+ "lttd": 31.48587,
"video_guid": "02d77364354a4f8982ad3d949e0d32ab",
"video_name": "张家河水库_坝脚_球机",
"online": "1",
@@ -791,8 +791,8 @@ const data5 = [
"town_nm": "顺河镇",
"res_cd": "42118150048",
"res_nm": "孙家榜水库",
- "res_lon": 114.91758,
- "res_lat": 31.26933,
+ "lgtd": 114.91758,
+ "lttd": 31.26933,
"video_guid": "03059577c270432bb7338e7f714b9a01",
"video_name": "孙家塝水库",
"online": "1",
@@ -807,8 +807,8 @@ const data5 = [
"town_nm": "三河口镇",
"res_cd": "42118150145",
"res_nm": "袁家冲水库",
- "res_lon": 115.28076,
- "res_lat": 31.28639,
+ "lgtd": 115.28076,
+ "lttd": 31.28639,
"video_guid": "031ac395df964414a17f9dc996e13d57",
"video_name": "袁家冲水库视频站",
"online": "1",
@@ -823,8 +823,8 @@ const data5 = [
"town_nm": "南湖办事处",
"res_cd": "42118140003",
"res_nm": "毛家冲水库",
- "res_lon": 114.98531,
- "res_lat": 31.20469,
+ "lgtd": 114.98531,
+ "lttd": 31.20469,
"video_guid": "036b290ac8e547a79f5835754e02772c",
"video_name": "毛家冲水库溢洪道",
"online": "1",
@@ -839,8 +839,8 @@ const data5 = [
"town_nm": "歧亭镇",
"res_cd": "42118150224",
"res_nm": "兴隆寺水库",
- "res_lon": 114.69534,
- "res_lat": 31.01031,
+ "lgtd": 114.69534,
+ "lttd": 31.01031,
"video_guid": "0385335df9c64c1f8972cf3ed17b4854",
"video_name": "兴隆寺水库_坝脚_球机",
"online": "1",
@@ -855,8 +855,8 @@ const data5 = [
"town_nm": "中馆驿镇",
"res_cd": "42118150094",
"res_nm": "西冲水库",
- "res_lon": 114.94118,
- "res_lat": 31.06765,
+ "lgtd": 114.94118,
+ "lttd": 31.06765,
"video_guid": "046336873b8a4eefbc321bd2e6e4359c",
"video_name": "西冲水库",
"online": "1",
@@ -897,6 +897,15 @@ function DrpReal({ style }) {
if(tab==='2'&&hdData){
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{
const dsq = setInterval(() => {
const map = window.__mapref;
@@ -1065,6 +1074,137 @@ function DrpReal({ style }) {
'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))
}
@@ -1186,8 +1326,9 @@ function DrpReal({ style }) {
{/* {index+1} */}
{
- const { res_lon:lgtd, res_lat:lttd } = row;
+ const { lgtd, lttd } = row;
if (lgtd && lttd) {
+ dispatch.runtime.setFeaturePop({ type: '流量水表站', properties: row, coordinates: [row.lgtd, row.lttd] });
dispatch.runtime.setCameraTarget({
center: [lgtd, lttd],
zoom: 15,
@@ -1221,8 +1362,9 @@ function DrpReal({ style }) {
{index+1}
{
- const { res_lon:lgtd, res_lat:lttd } = row;
+ const { lgtd, lttd } = row;
if (lgtd && lttd) {
+ dispatch.runtime.setFeaturePop({ type: 'PicStPop', properties: row, coordinates: [row.lgtd, row.lttd] });
dispatch.runtime.setCameraTarget({
center: [lgtd, lttd],
zoom: 15,
@@ -1255,8 +1397,9 @@ function DrpReal({ style }) {
{index+1}
{
- const { res_lon:lgtd, res_lat:lttd } = row;
- if (lgtd && lttd) {
+ const { lgtd, lttd } = row;
+ if (lgtd && lttd) {
+ dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: row, coordinates: [row.lgtd, row.lttd] });
dispatch.runtime.setCameraTarget({
center: [lgtd, lttd],
zoom: 15,
diff --git a/src/views/Home/panels/Gsfhqx/chart.js b/src/views/Home/panels/Gsfhqx/chart.js
index fc95a84..fe91acc 100644
--- a/src/views/Home/panels/Gsfhqx/chart.js
+++ b/src/views/Home/panels/Gsfhqx/chart.js
@@ -157,7 +157,7 @@ const AreaDrpChart = ({index}) => {
name: '实际产水',
type: 'line',
barWidth: 10,
- data: y.map((item)=>item*(index+1)*1.1),
+ data: y.map((item)=>item*index),
showSymbol: false,
itemStyle: {
normal: {
diff --git a/src/views/Home/panels/Gsfhqx/index.js b/src/views/Home/panels/Gsfhqx/index.js
index 714b8a0..4954141 100644
--- a/src/views/Home/panels/Gsfhqx/index.js
+++ b/src/views/Home/panels/Gsfhqx/index.js
@@ -8,136 +8,171 @@ import config from '../../../../config';
function DrpReal({ style }) {
- const [dimension, setDimension] =useState('61614460');
- const [index,setIndex ] = useState(0)
+ const [dimension, setDimension] =useState(1);
+ const [index,setIndex ] = useState(1)
const dispatch = useDispatch();
const data = [
{
- "stcd": "61614460",
- "stnm": "项生(宋埠)",
- "adcd": "421181000000000",
+ "stcd": "61614200",
+ "type": "sk",
+ "hasRz": true,
+ "stnm": "浮桥河水厂",
+ zb: '浊度',
+ index:1,
+ yjvalue: 0.6,
+ status:1,
+ "adcd": "421181100000",
"wscd": null,
"importancy": 0,
- "lgtd": 114.798056,
- "lttd": 31.058611,
- "elev": null,
+ "lgtd": 114.875,
+ "lttd": 31.166667,
+ "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,
- "wrz": null,
- "wrq": null,
- "grz": null,
- "grq": null,
- "sfz": null,
- "sfq": null,
- "type": "sh",
- "tm": "2025-06-03T02:00:00.000Z",
- "rz": 21.91,
- "trend": 1,
- "state": 1,
- "warning": 0,
- "maxRz": 21.91,
- "maxDate": "2025-06-03T02:00:00.000Z",
- "warndes": null
- },{
- "stcd": "61613700",
- "stnm": "四角门(宋铁二桥)",
- "adcd": "421181000000000",
- "wscd": null,
- "importancy": 0,
- "lgtd": 114.8291,
- "lttd": 31.0754,
- "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": 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,
- "importancy": 0,
- "lgtd": 115.087777777,
- "lttd": 31.164444444,
- "elev": null,
- "hasRz": true,
- "wrz": null,
- "wrq": null,
- "grz": null,
- "grq": null,
- "sfz": null,
- "sfq": null,
- "type": "sh",
- "tm": "2025-06-03T02:35:00.000Z",
- "rz": 55.67,
- "trend": 0,
- "state": 1,
- "warning": 0,
- "maxRz": 55.67,
- "maxDate": "2025-06-03T02:00:00.000Z",
- "warndes": null
-},{
- "stcd": "61615110",
- "stnm": "杨梅河(木子店)",
- "adcd": "421181000000000",
- "wscd": null,
- "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
-},
+ "stnm": "三河口水厂",
+ zb: '余氯',
+ yjvalue: 0.25,
+ "adcd": "421181109000",
+ "wscd": null,
+ percent: 94.29,
+ "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-03T02:00:00.000Z",
+ "today": 0,
+ "h1": 0,
+ "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,
+ "importancy": 0,
+ "lgtd": 115.048056,
+ "lttd": 31.335556,
+ "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,
+ "stnm": "杉林河水厂",
+ index:1.3,
+ 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
+ },
]
@@ -155,8 +190,8 @@ function DrpReal({ style }) {
value={dimension}
label=""
onChange={(event,b) => {
- setIndex(b)
- // const value = event.target.value;
+ const value = event.target.value;
+ setIndex(value)
// setDimension(value);
// const record = data.filter(o=>o.stcd===value)[0]
// const { lgtd, lttd } = record;
@@ -172,7 +207,7 @@ function DrpReal({ style }) {
>
{
data.map((item)=>
-
+
)
}
diff --git a/src/views/Home/panels/Overall/OverallContent.js b/src/views/Home/panels/Overall/OverallContent.js
index 801d545..2d39046 100644
--- a/src/views/Home/panels/Overall/OverallContent.js
+++ b/src/views/Home/panels/Overall/OverallContent.js
@@ -81,8 +81,8 @@ export default function OverallContent({ data }) {
dispatch.runtime.setFeaturePop({ type: poptype, properties: record, coordinates: [lgtd, lttd] });
dispatch.runtime.setCameraTarget({
center: [lgtd, lttd],
- zoom: 15,
- pitch: config.poiPitch,
+ zoom: 13,
+ pitch: 30,//config.poiPitch,
});
}
}
diff --git a/src/views/Home/panels/Sbtj/index.js b/src/views/Home/panels/Sbtj/index.js
index e5e1789..fb1bfbd 100644
--- a/src/views/Home/panels/Sbtj/index.js
+++ b/src/views/Home/panels/Sbtj/index.js
@@ -13,7 +13,7 @@ function DrpReal({ style }) {
}
>
- 
+ 
)
}
diff --git a/src/views/Home/panels/Sczl/index.js b/src/views/Home/panels/Sczl/index.js
index 164c898..770b738 100644
--- a/src/views/Home/panels/Sczl/index.js
+++ b/src/views/Home/panels/Sczl/index.js
@@ -18,104 +18,162 @@ const { RangePicker } = DatePicker;
const data1 = [
{
- "res_cd": "42118140035",
- "res_lon": 115.14137,
- "res_lat": 31.55095,
- "cd": "01",
- "cd_nm": "GN1",
- "res_reg_cd": "42118140006-A4",
- "ch": "0+000",
- "province_cd": "420000000000",
- "province_nm": "湖北省",
- "city_cd": "421100000000",
- "city_nm": "黄冈市",
- "county_cd": "421181000000",
- "county_nm": "麻城市",
- "town_cd": "421181112000",
- "town_nm": "福田河镇",
- "bas_guid": "鄂东五河片区",
- "eng_scal": "小（1）型",
- "danger_stat": "非病险水库",
- "label": "2023高标准",
- "res_nm": "大堰口水库",
- "de_value": -4.2885,
- "dn_value": -13.5384,
- "du_value": 132.4892,
- "de_trend": null,
- "dn_trend": null,
- "du_trend": null,
- "max_de": 1.0981,
- "max_dn": -2.3255,
- "max_du": 132.4892,
- "dt": "2025-05-20",
- "is_has_data": "y"
+ "stcd": "61614200",
+ "type": "sk",
+ "hasRz": true,
+ "stnm": "浮桥河水厂",
+ zb: '浊度',
+ yjvalue: 0.6,
+ status:1,
+ "adcd": "421181100000",
+ "wscd": null,
+ "importancy": 0,
+ "lgtd": 114.875,
+ "lttd": 31.166667,
+ "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
},
{
- "res_cd": "42118140035",
- "res_lon": 115.14137,
- "res_lat": 31.55095,
- "cd": "03",
- "cd_nm": "GN3",
- "res_reg_cd": "42118140006-A4",
- "ch": "0+000",
- "province_cd": "420000000000",
- "province_nm": "湖北省",
- "city_cd": "421100000000",
- "city_nm": "黄冈市",
- "county_cd": "421181000000",
- "county_nm": "麻城市",
- "town_cd": "421181112000",
- "town_nm": "福田河镇",
- "bas_guid": "鄂东五河片区",
- "eng_scal": "小（1）型",
- "danger_stat": "非病险水库",
- "label": "2023高标准",
- "res_nm": "大堰口水库",
- "de_value": -10.73,
- "dn_value": -9.8975,
- "du_value": 121.3495,
- "de_trend": null,
- "dn_trend": null,
- "du_trend": null,
- "max_de": 1.0981,
- "max_dn": -2.3255,
- "max_du": 132.4892,
- "dt": "2025-05-20",
- "is_has_data": "y"
+ "stcd": "61612610",
+ "type": "sk",
+ "hasRz": true,
+ "stnm": "三河口水厂",
+ zb: '余氯',
+ yjvalue: 0.25,
+ "adcd": "421181109000",
+ "wscd": null,
+ percent: 94.29,
+ "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-03T02:00:00.000Z",
+ "today": 0,
+ "h1": 0,
+ "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
},
{
- "res_cd": "42118140035",
- "res_lon": 115.14137,
- "res_lat": 31.55095,
- "cd": "02",
- "cd_nm": "GN2",
- "res_reg_cd": "42118140006-A4",
- "ch": "0+000",
- "province_cd": "420000000000",
- "province_nm": "湖北省",
- "city_cd": "421100000000",
- "city_nm": "黄冈市",
- "county_cd": "421181000000",
- "county_nm": "麻城市",
- "town_cd": "421181112000",
- "town_nm": "福田河镇",
- "bas_guid": "鄂东五河片区",
- "eng_scal": "小（1）型",
- "danger_stat": "非病险水库",
- "label": "2023高标准",
- "res_nm": "大堰口水库",
- "de_value": 1.0981,
- "dn_value": -7.0736,
- "du_value": 75.4661,
- "de_trend": null,
- "dn_trend": null,
- "du_trend": null,
- "max_de": 1.0981,
- "max_dn": -2.3255,
- "max_du": 132.4892,
- "dt": "2025-05-20",
- "is_has_data": "y"
- }
+ "stcd": "7CS000231",
+ "type": "sk",
+ "hasRz": true,
+ "stnm": "刘集水厂",
+ zb: 'PH值',
+ yjvalue: 7.4,
+ percent: 56.98,
+ "adcd": "421181100000",
+ "wscd": null,
+ "importancy": 0,
+ "lgtd": 115.048056,
+ "lttd": 31.335556,
+ "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,
+ "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
+ },
]
@@ -171,7 +229,7 @@ function DrpReal({ style }) {
+
)
}
diff --git a/src/views/Home/panels/Sczl/index.js b/src/views/Home/panels/Sczl/index.js
index 164c898..770b738 100644
--- a/src/views/Home/panels/Sczl/index.js
+++ b/src/views/Home/panels/Sczl/index.js
@@ -18,104 +18,162 @@ const { RangePicker } = DatePicker;
const data1 = [
{
- "res_cd": "42118140035",
- "res_lon": 115.14137,
- "res_lat": 31.55095,
- "cd": "01",
- "cd_nm": "GN1",
- "res_reg_cd": "42118140006-A4",
- "ch": "0+000",
- "province_cd": "420000000000",
- "province_nm": "湖北省",
- "city_cd": "421100000000",
- "city_nm": "黄冈市",
- "county_cd": "421181000000",
- "county_nm": "麻城市",
- "town_cd": "421181112000",
- "town_nm": "福田河镇",
- "bas_guid": "鄂东五河片区",
- "eng_scal": "小（1）型",
- "danger_stat": "非病险水库",
- "label": "2023高标准",
- "res_nm": "大堰口水库",
- "de_value": -4.2885,
- "dn_value": -13.5384,
- "du_value": 132.4892,
- "de_trend": null,
- "dn_trend": null,
- "du_trend": null,
- "max_de": 1.0981,
- "max_dn": -2.3255,
- "max_du": 132.4892,
- "dt": "2025-05-20",
- "is_has_data": "y"
+ "stcd": "61614200",
+ "type": "sk",
+ "hasRz": true,
+ "stnm": "浮桥河水厂",
+ zb: '浊度',
+ yjvalue: 0.6,
+ status:1,
+ "adcd": "421181100000",
+ "wscd": null,
+ "importancy": 0,
+ "lgtd": 114.875,
+ "lttd": 31.166667,
+ "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
},
{
- "res_cd": "42118140035",
- "res_lon": 115.14137,
- "res_lat": 31.55095,
- "cd": "03",
- "cd_nm": "GN3",
- "res_reg_cd": "42118140006-A4",
- "ch": "0+000",
- "province_cd": "420000000000",
- "province_nm": "湖北省",
- "city_cd": "421100000000",
- "city_nm": "黄冈市",
- "county_cd": "421181000000",
- "county_nm": "麻城市",
- "town_cd": "421181112000",
- "town_nm": "福田河镇",
- "bas_guid": "鄂东五河片区",
- "eng_scal": "小（1）型",
- "danger_stat": "非病险水库",
- "label": "2023高标准",
- "res_nm": "大堰口水库",
- "de_value": -10.73,
- "dn_value": -9.8975,
- "du_value": 121.3495,
- "de_trend": null,
- "dn_trend": null,
- "du_trend": null,
- "max_de": 1.0981,
- "max_dn": -2.3255,
- "max_du": 132.4892,
- "dt": "2025-05-20",
- "is_has_data": "y"
+ "stcd": "61612610",
+ "type": "sk",
+ "hasRz": true,
+ "stnm": "三河口水厂",
+ zb: '余氯',
+ yjvalue: 0.25,
+ "adcd": "421181109000",
+ "wscd": null,
+ percent: 94.29,
+ "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-03T02:00:00.000Z",
+ "today": 0,
+ "h1": 0,
+ "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
},
{
- "res_cd": "42118140035",
- "res_lon": 115.14137,
- "res_lat": 31.55095,
- "cd": "02",
- "cd_nm": "GN2",
- "res_reg_cd": "42118140006-A4",
- "ch": "0+000",
- "province_cd": "420000000000",
- "province_nm": "湖北省",
- "city_cd": "421100000000",
- "city_nm": "黄冈市",
- "county_cd": "421181000000",
- "county_nm": "麻城市",
- "town_cd": "421181112000",
- "town_nm": "福田河镇",
- "bas_guid": "鄂东五河片区",
- "eng_scal": "小（1）型",
- "danger_stat": "非病险水库",
- "label": "2023高标准",
- "res_nm": "大堰口水库",
- "de_value": 1.0981,
- "dn_value": -7.0736,
- "du_value": 75.4661,
- "de_trend": null,
- "dn_trend": null,
- "du_trend": null,
- "max_de": 1.0981,
- "max_dn": -2.3255,
- "max_du": 132.4892,
- "dt": "2025-05-20",
- "is_has_data": "y"
- }
+ "stcd": "7CS000231",
+ "type": "sk",
+ "hasRz": true,
+ "stnm": "刘集水厂",
+ zb: 'PH值',
+ yjvalue: 7.4,
+ percent: 56.98,
+ "adcd": "421181100000",
+ "wscd": null,
+ "importancy": 0,
+ "lgtd": 115.048056,
+ "lttd": 31.335556,
+ "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,
+ "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
+ },
]
@@ -171,7 +229,7 @@ function DrpReal({ style }) {