diff --git a/public/assets/jcgj.jpg b/public/assets/jcgj.jpg new file mode 100644 index 0000000..d0ef114 Binary files /dev/null and b/public/assets/jcgj.jpg differ diff --git a/public/assets/浸润线修改.png b/public/assets/浸润线修改.png new file mode 100644 index 0000000..0723316 Binary files /dev/null and b/public/assets/浸润线修改.png differ diff --git a/public/assets/浸润线修改2.png b/public/assets/浸润线修改2.png new file mode 100644 index 0000000..3af0a9e Binary files /dev/null and b/public/assets/浸润线修改2.png differ diff --git a/public/mapbox/sprite.json b/public/mapbox/sprite.json index 0fd4013..f3d22ff 100644 --- a/public/mapbox/sprite.json +++ b/public/mapbox/sprite.json @@ -46,6 +46,14 @@ "y": 0, "pixelRatio": 1, "visible": true + }, + "实时雨量1": { + "width": 32, + "height": 32, + "x": 220, + "y": 190, + "pixelRatio": 1, + "visible": true }, "水库": { "width": 32, @@ -54,6 +62,22 @@ "y": 0, "pixelRatio": 1, "visible": true + }, + "水库1": { + "width": 32, + "height": 32, + "x": 32, + "y": 0, + "pixelRatio": 1, + "visible": true + }, + "巡查": { + "width": 32, + "height": 32, + "x": 128, + "y": 32, + "pixelRatio": 1, + "visible": true }, "水库-离线": { "width": 32, @@ -247,6 +271,14 @@ "pixelRatio": 1, "visible": true }, + "流量站": { + "width": 32, + "height": 32, + "x": 160, + "y": 32, + "pixelRatio": 1, + "visible": true + }, "泵站": { "width": 32, "height": 32, @@ -286,5 +318,117 @@ "y": 256, "pixelRatio": 1, "visible": true + }, + "变形监测": { + "width": 26, + "height": 26, + "x": 0, + "y": 288, + "pixelRatio": 0.8, + "visible": true + }, + "渗压监测": { + "width": 26, + "height": 26, + "x": 28, + "y": 290, + "pixelRatio": 0.6, + "visible": true + }, + "渗流监测": { + "width": 22, + "height": 22, + "x": 52, + "y": 290, + "pixelRatio": 0.5, + "visible": true + }, + "白蚁监测": { + "width": 20, + "height": 30, + "x": 74, + "y": 286, + "pixelRatio": 0.5, + "visible": true + }, + "水闸2": { + "width": 24, + "height": 32, + "x": 94, + "y": 290, + "pixelRatio": 0.5, + "visible": true + }, + "泵站2": { + "width": 15, + "height": 32, + "x": 118, + "y": 290, + "pixelRatio": 0.5, + "visible": true + }, + "水表": { + "width": 20, + "height": 32, + "x": 133, + "y": 290, + "pixelRatio": 0.5, + "visible": true + }, + "渠道": { + "width": 14, + "height": 32, + "x": 153, + "y": 290, + "pixelRatio": 0.6, + "visible": true + }, + "水质": { + "width": 16, + "height": 32, + "x": 167, + "y": 290, + "pixelRatio": 0.5, + "visible": true + }, + "土壤墒情": { + "width": 24, + "height": 32, + "x": 183, + "y": 290, + "pixelRatio": 0.5, + "visible": true + }, + "水厂": { + "width": 32, + "height": 32, + "x": -3, + "y": 315, + "pixelRatio": 0.6, + "visible": true + }, + "水厂q": { + "width": 32, + "height": 32, + "x": 28, + "y": 315, + "pixelRatio": 0.6, + "visible": true + }, + "水源地": { + "width": 32, + "height": 32, + "x": 256, + "y": 0, + "pixelRatio": 0.6, + "visible": true + } , + "水源地q": { + "width": 32, + "height": 32, + "x": 59, + "y": 315, + "pixelRatio": 0.6, + "visible": true } } \ No newline at end of file diff --git a/public/mapbox/sprite.png b/public/mapbox/sprite.png index 570a999..b334a4e 100644 Binary files a/public/mapbox/sprite.png and b/public/mapbox/sprite.png differ diff --git a/src/config.js b/src/config.js index b5e82fb..26063b6 100644 --- a/src/config.js +++ b/src/config.js @@ -10,6 +10,7 @@ const config = { address, title: '麻城市智慧水利一张图', title2: '麻城市防汛一张图', + title3: '麻城市水库一张图', ADCD, ADCD6, ADCD12, diff --git a/src/views/Home/InfoDlg/SyjcDlg/view.js b/src/views/Home/InfoDlg/SyjcDlg/view.js index e935a66..0c04b68 100644 --- a/src/views/Home/InfoDlg/SyjcDlg/view.js +++ b/src/views/Home/InfoDlg/SyjcDlg/view.js @@ -29,7 +29,8 @@ function HDStDlg({ record, onClose,open }) {
- + {/* */} +
diff --git a/src/views/Home/InfoDlg/WyWarnDlg/index.js b/src/views/Home/InfoDlg/WyWarnDlg/index.js index e74132a..8be94cb 100644 --- a/src/views/Home/InfoDlg/WyWarnDlg/index.js +++ b/src/views/Home/InfoDlg/WyWarnDlg/index.js @@ -60,7 +60,7 @@ function HDStDlg({ record, onClose }) { GN1 红色 -120mm - 100mm + ±100mm diff --git a/src/views/Home/components/ActionDock/index.js b/src/views/Home/components/ActionDock/index.js index 370bd33..a98de62 100644 --- a/src/views/Home/components/ActionDock/index.js +++ b/src/views/Home/components/ActionDock/index.js @@ -126,7 +126,8 @@ export default function ActionDock({ }) {
{ if (o.children) { if(o.id===400){ - window.open("https://axhub.im/ax9/eec435b86544bac8/#id=arlcql&p=%E7%81%8C%E5%8C%BA%E6%80%BB%E8%A7%88&sc=1&c=1") + // window.open("https://axhub.im/ax9/eec435b86544bac8/#id=arlcql&p=%E7%81%8C%E5%8C%BA%E6%80%BB%E8%A7%88&sc=1&c=1") + window.open("https://workspace.easyv.cloud/shareScreen/eyJzY3JlZW5JZCI6MzUwOTQ0MywiZXhwaXJlZEF0IjoiMjAyNS0wNy0xMFQwODo1Nzo1NS40MjBaIn0=") return } //一级菜单 diff --git a/src/views/Home/components/Title/index.js b/src/views/Home/components/Title/index.js index 16489f6..e602af7 100644 --- a/src/views/Home/components/Title/index.js +++ b/src/views/Home/components/Title/index.js @@ -80,9 +80,12 @@ export default function Title() { const getTitle = (view)=>{ if(view===1||view===3||view===4||view===5||view===6||view===8){ return `${ config.title2 }` - }else{ - return `${ config.title }` } + if(view===203||view===205||view===206||view===207){ + return `${ config.title3 }` + } + + return `${ config.title }` } return ( diff --git a/src/views/Home/panels/Byjc/index.js b/src/views/Home/panels/Byjc/index.js index be65375..c8a2169 100644 --- a/src/views/Home/panels/Byjc/index.js +++ b/src/views/Home/panels/Byjc/index.js @@ -439,7 +439,7 @@ function DrpReal({ style }) { "eng_scal": "小(1)型", "danger_stat": "非病险水库", "label": "2023高标准", - "value": 43.95, + "value": 50.5, "diff_value": -0.0246, "trend": -1, "is_has_data": "y", @@ -558,7 +558,7 @@ function DrpReal({ style }) { "eng_scal": "小(1)型", "danger_stat": "非病险水库", "label": "2023高标准", - "value": 43.95, + "value": 50.5, "diff_value": -0.0142, "trend": -1, "is_has_data": "y", diff --git a/src/views/Home/panels/Jcgj/index.js b/src/views/Home/panels/Jcgj/index.js index 7635979..183b52f 100644 --- a/src/views/Home/panels/Jcgj/index.js +++ b/src/views/Home/panels/Jcgj/index.js @@ -58,7 +58,53 @@ function HDReal({ style }) {
} > -
+
+
变形监测
+
+
+
水库名称:
+
浮桥河水库
+
预警级别:
+
红色
+
+
+
测点编号:
+
GN1
+
监测值:
+
-120mm
+
+
+
阈值:
+
±100mm
+
告警时间:
+
2025-07-03 07:00:01
+
+
+
+
+
视频AI
+
+
+
水库名称:
+
浮桥河水库
+
+
+
告警类型:
+
漂浮物
+
+
+
告警点位:
+
大坝坝中
+
+
+
告警时间:
+
2025-07-03 07:00:01
+
+ + +
+
+ {/*
@@ -78,7 +124,7 @@ function HDReal({ style }) { -
+
*/} { setting && showSetting(false)} /> }