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 }) {
+ {/*
*/}
+
+
@@ -78,7 +124,7 @@ function HDReal({ style }) {
-