diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ

diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
index 9afe894..af9fff2 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
Binary files differ

diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
index 9afe894..af9fff2 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
Binary files differ
diff --git a/public/static/libs/mapbox/style/sprite/sprite.json b/public/static/libs/mapbox/style/sprite/sprite.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.json
+++ b/public/static/libs/mapbox/style/sprite/sprite.json
@@ -260,43 +260,45 @@
   "雨水泵站扎点@2x":{"x":28,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网水质扎点@2x":{"x":56,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网液位扎点@2x":{"x":84,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x(1)":{"x":112,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x":{"x":140,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@2x":{"x":168,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "wsc1":{"x":196,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x(1)":{"x":236,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x":{"x":278,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x(1)":{"x":320,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x":{"x":362,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分区信息扎点@3x":{"x":404,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水位扎点@3x":{"x":446,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水质扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河湖溢流风险口扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河流渠道扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊水位扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "接驳口扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口水质扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x(1)":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水户扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水护扎点@3x":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库范围i扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x(1)":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x(1)":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水厂扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水处理厂扎点@3x":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水管网水质扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨量站扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x(1)":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网水质扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网液位扎点@3x":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x(1)":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
+  "wsc1":{"x":112,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@2x(1)":{"x":152,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点@2x":{"x":194,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点_告警@2x":{"x":236,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点@2x":{"x":278,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点_告警@2x":{"x":319,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "调蓄池扎点@3x(1)":{"x":360,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "调蓄池扎点@3x":{"x":402,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x(1)":{"x":444,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分区信息扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水位扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水质扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河湖溢流风险口扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河流渠道扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊水位扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊扎点@3x":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "接驳口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口水质扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x(1)":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水户扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水护扎点@3x":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库范围i扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库扎点@3x":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x(1)":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x(1)":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水厂扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水处理厂扎点@3x":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水管网水质扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨量站扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x(1)":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网水质扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网液位扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x(1)":{"x":210,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x":{"x":252,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水监测点扎点@3x":{"x":294,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
 }

diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
index 9afe894..af9fff2 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
Binary files differ
diff --git a/public/static/libs/mapbox/style/sprite/sprite.json b/public/static/libs/mapbox/style/sprite/sprite.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.json
+++ b/public/static/libs/mapbox/style/sprite/sprite.json
@@ -260,43 +260,45 @@
   "雨水泵站扎点@2x":{"x":28,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网水质扎点@2x":{"x":56,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网液位扎点@2x":{"x":84,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x(1)":{"x":112,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x":{"x":140,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@2x":{"x":168,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "wsc1":{"x":196,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x(1)":{"x":236,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x":{"x":278,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x(1)":{"x":320,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x":{"x":362,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分区信息扎点@3x":{"x":404,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水位扎点@3x":{"x":446,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水质扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河湖溢流风险口扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河流渠道扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊水位扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "接驳口扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口水质扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x(1)":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水户扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水护扎点@3x":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库范围i扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x(1)":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x(1)":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水厂扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水处理厂扎点@3x":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水管网水质扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨量站扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x(1)":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网水质扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网液位扎点@3x":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x(1)":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
+  "wsc1":{"x":112,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@2x(1)":{"x":152,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点@2x":{"x":194,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点_告警@2x":{"x":236,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点@2x":{"x":278,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点_告警@2x":{"x":319,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "调蓄池扎点@3x(1)":{"x":360,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "调蓄池扎点@3x":{"x":402,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x(1)":{"x":444,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分区信息扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水位扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水质扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河湖溢流风险口扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河流渠道扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊水位扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊扎点@3x":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "接驳口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口水质扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x(1)":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水户扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水护扎点@3x":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库范围i扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库扎点@3x":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x(1)":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x(1)":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水厂扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水处理厂扎点@3x":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水管网水质扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨量站扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x(1)":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网水质扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网液位扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x(1)":{"x":210,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x":{"x":252,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水监测点扎点@3x":{"x":294,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
 }
diff --git a/public/static/libs/mapbox/style/sprite/sprite.png b/public/static/libs/mapbox/style/sprite/sprite.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.png
+++ b/public/static/libs/mapbox/style/sprite/sprite.png
Binary files differ

diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
index 9afe894..af9fff2 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
Binary files differ
diff --git a/public/static/libs/mapbox/style/sprite/sprite.json b/public/static/libs/mapbox/style/sprite/sprite.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.json
+++ b/public/static/libs/mapbox/style/sprite/sprite.json
@@ -260,43 +260,45 @@
   "雨水泵站扎点@2x":{"x":28,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网水质扎点@2x":{"x":56,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网液位扎点@2x":{"x":84,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x(1)":{"x":112,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x":{"x":140,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@2x":{"x":168,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "wsc1":{"x":196,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x(1)":{"x":236,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x":{"x":278,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x(1)":{"x":320,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x":{"x":362,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分区信息扎点@3x":{"x":404,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水位扎点@3x":{"x":446,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水质扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河湖溢流风险口扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河流渠道扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊水位扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "接驳口扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口水质扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x(1)":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水户扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水护扎点@3x":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库范围i扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x(1)":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x(1)":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水厂扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水处理厂扎点@3x":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水管网水质扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨量站扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x(1)":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网水质扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网液位扎点@3x":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x(1)":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
+  "wsc1":{"x":112,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@2x(1)":{"x":152,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点@2x":{"x":194,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点_告警@2x":{"x":236,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点@2x":{"x":278,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点_告警@2x":{"x":319,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "调蓄池扎点@3x(1)":{"x":360,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "调蓄池扎点@3x":{"x":402,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x(1)":{"x":444,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分区信息扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水位扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水质扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河湖溢流风险口扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河流渠道扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊水位扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊扎点@3x":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "接驳口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口水质扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x(1)":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水户扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水护扎点@3x":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库范围i扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库扎点@3x":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x(1)":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x(1)":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水厂扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水处理厂扎点@3x":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水管网水质扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨量站扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x(1)":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网水质扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网液位扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x(1)":{"x":210,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x":{"x":252,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水监测点扎点@3x":{"x":294,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
 }
diff --git a/public/static/libs/mapbox/style/sprite/sprite.png b/public/static/libs/mapbox/style/sprite/sprite.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.png
+++ b/public/static/libs/mapbox/style/sprite/sprite.png
Binary files differ
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 4e53377..4d288f5 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -463,4 +463,4 @@
     method: 'get',
     params: query
   })
-}
+}
\ No newline at end of file

diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
index 9afe894..af9fff2 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
Binary files differ
diff --git a/public/static/libs/mapbox/style/sprite/sprite.json b/public/static/libs/mapbox/style/sprite/sprite.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.json
+++ b/public/static/libs/mapbox/style/sprite/sprite.json
@@ -260,43 +260,45 @@
   "雨水泵站扎点@2x":{"x":28,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网水质扎点@2x":{"x":56,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网液位扎点@2x":{"x":84,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x(1)":{"x":112,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x":{"x":140,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@2x":{"x":168,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "wsc1":{"x":196,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x(1)":{"x":236,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x":{"x":278,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x(1)":{"x":320,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x":{"x":362,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分区信息扎点@3x":{"x":404,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水位扎点@3x":{"x":446,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水质扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河湖溢流风险口扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河流渠道扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊水位扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "接驳口扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口水质扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x(1)":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水户扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水护扎点@3x":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库范围i扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x(1)":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x(1)":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水厂扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水处理厂扎点@3x":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水管网水质扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨量站扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x(1)":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网水质扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网液位扎点@3x":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x(1)":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
+  "wsc1":{"x":112,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@2x(1)":{"x":152,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点@2x":{"x":194,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点_告警@2x":{"x":236,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点@2x":{"x":278,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点_告警@2x":{"x":319,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "调蓄池扎点@3x(1)":{"x":360,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "调蓄池扎点@3x":{"x":402,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x(1)":{"x":444,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分区信息扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水位扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水质扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河湖溢流风险口扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河流渠道扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊水位扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊扎点@3x":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "接驳口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口水质扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x(1)":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水户扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水护扎点@3x":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库范围i扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库扎点@3x":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x(1)":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x(1)":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水厂扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水处理厂扎点@3x":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水管网水质扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨量站扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x(1)":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网水质扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网液位扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x(1)":{"x":210,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x":{"x":252,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水监测点扎点@3x":{"x":294,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
 }
diff --git a/public/static/libs/mapbox/style/sprite/sprite.png b/public/static/libs/mapbox/style/sprite/sprite.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.png
+++ b/public/static/libs/mapbox/style/sprite/sprite.png
Binary files differ
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 4e53377..4d288f5 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -463,4 +463,4 @@
     method: 'get',
     params: query
   })
-}
+}
\ No newline at end of file
diff --git a/src/assets/images/pictureOnMap/leftBZ.png b/src/assets/images/pictureOnMap/leftBZ.png
new file mode 100644
index 0000000..1af9f89
--- /dev/null
+++ b/src/assets/images/pictureOnMap/leftBZ.png
Binary files differ

diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
index 9afe894..af9fff2 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
Binary files differ
diff --git a/public/static/libs/mapbox/style/sprite/sprite.json b/public/static/libs/mapbox/style/sprite/sprite.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.json
+++ b/public/static/libs/mapbox/style/sprite/sprite.json
@@ -260,43 +260,45 @@
   "雨水泵站扎点@2x":{"x":28,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网水质扎点@2x":{"x":56,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网液位扎点@2x":{"x":84,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x(1)":{"x":112,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x":{"x":140,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@2x":{"x":168,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "wsc1":{"x":196,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x(1)":{"x":236,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x":{"x":278,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x(1)":{"x":320,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x":{"x":362,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分区信息扎点@3x":{"x":404,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水位扎点@3x":{"x":446,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水质扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河湖溢流风险口扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河流渠道扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊水位扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "接驳口扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口水质扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x(1)":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水户扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水护扎点@3x":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库范围i扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x(1)":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x(1)":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水厂扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水处理厂扎点@3x":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水管网水质扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨量站扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x(1)":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网水质扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网液位扎点@3x":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x(1)":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
+  "wsc1":{"x":112,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@2x(1)":{"x":152,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点@2x":{"x":194,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点_告警@2x":{"x":236,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点@2x":{"x":278,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点_告警@2x":{"x":319,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "调蓄池扎点@3x(1)":{"x":360,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "调蓄池扎点@3x":{"x":402,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x(1)":{"x":444,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分区信息扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水位扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水质扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河湖溢流风险口扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河流渠道扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊水位扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊扎点@3x":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "接驳口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口水质扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x(1)":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水户扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水护扎点@3x":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库范围i扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库扎点@3x":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x(1)":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x(1)":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水厂扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水处理厂扎点@3x":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水管网水质扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨量站扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x(1)":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网水质扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网液位扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x(1)":{"x":210,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x":{"x":252,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水监测点扎点@3x":{"x":294,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
 }
diff --git a/public/static/libs/mapbox/style/sprite/sprite.png b/public/static/libs/mapbox/style/sprite/sprite.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.png
+++ b/public/static/libs/mapbox/style/sprite/sprite.png
Binary files differ
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 4e53377..4d288f5 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -463,4 +463,4 @@
     method: 'get',
     params: query
   })
-}
+}
\ No newline at end of file
diff --git a/src/assets/images/pictureOnMap/leftBZ.png b/src/assets/images/pictureOnMap/leftBZ.png
new file mode 100644
index 0000000..1af9f89
--- /dev/null
+++ b/src/assets/images/pictureOnMap/leftBZ.png
Binary files differ
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index cb99f34..ecea8c4 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -41,6 +41,7 @@
 import { LineLayer, GeoJsonLayer } from "@deck.gl/layers";
 import { TripsLayer, Tile3DLayer } from "@deck.gl/geo-layers";
 import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
+const baseUrl = import.meta.env.VITE_APP_MAP_BASE_API || "";
 const appStore = useUserStore();
 const MapShow = ref(true);
 const props = defineProps({
@@ -448,10 +449,10 @@
     let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0];
     outlet && outletRouteMethod({id:String(outlet.dataId)},false);
 
-    let lake = relationDataList.filter(i => i.dataCode == keys[2])[0];
-    let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i));
+    let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean);
+    let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i));
     features.forEach(k => (k.properties.type = undefined))
-      lake &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
+    relationIds &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
     busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true });
   }
 
@@ -817,13 +818,17 @@
   const { setLayerVisible, beansToMap } = events_params;
   const fullnessColor = (value) => {
     value = Number(value);
-    const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
+    if(!(location.href.includes('dhgx.'))) value = _.random(60,100);
+    const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
     return (colors.filter((i,idx) => idx!= colors.length-1 && i.value<value && value<colors[idx+1].value)[0] || colors[colors.length-1]).color;
   }
   const nameConcat = (item)=>{
     return (({
       lake_water_level:()=>{
         return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
+      },
+      waterlogging:()=>{
+        return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
       }
     })[item.pointType] || (()=> item.name))();
   }
@@ -852,7 +857,7 @@
     fullness:{
       method:getPipeMonitorRun,
       fields:{geometry:"pipelineGeometry",name:"name"},
-      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:4,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
+      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:8,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
     }
   };
   const other_data_params = {};

diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
index 9afe894..af9fff2 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
Binary files differ
diff --git a/public/static/libs/mapbox/style/sprite/sprite.json b/public/static/libs/mapbox/style/sprite/sprite.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.json
+++ b/public/static/libs/mapbox/style/sprite/sprite.json
@@ -260,43 +260,45 @@
   "雨水泵站扎点@2x":{"x":28,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网水质扎点@2x":{"x":56,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网液位扎点@2x":{"x":84,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x(1)":{"x":112,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x":{"x":140,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@2x":{"x":168,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "wsc1":{"x":196,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x(1)":{"x":236,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x":{"x":278,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x(1)":{"x":320,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x":{"x":362,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分区信息扎点@3x":{"x":404,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水位扎点@3x":{"x":446,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水质扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河湖溢流风险口扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河流渠道扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊水位扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "接驳口扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口水质扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x(1)":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水户扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水护扎点@3x":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库范围i扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x(1)":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x(1)":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水厂扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水处理厂扎点@3x":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水管网水质扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨量站扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x(1)":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网水质扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网液位扎点@3x":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x(1)":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
+  "wsc1":{"x":112,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@2x(1)":{"x":152,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点@2x":{"x":194,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点_告警@2x":{"x":236,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点@2x":{"x":278,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点_告警@2x":{"x":319,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "调蓄池扎点@3x(1)":{"x":360,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "调蓄池扎点@3x":{"x":402,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x(1)":{"x":444,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分区信息扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水位扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水质扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河湖溢流风险口扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河流渠道扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊水位扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊扎点@3x":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "接驳口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口水质扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x(1)":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水户扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水护扎点@3x":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库范围i扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库扎点@3x":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x(1)":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x(1)":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水厂扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水处理厂扎点@3x":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水管网水质扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨量站扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x(1)":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网水质扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网液位扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x(1)":{"x":210,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x":{"x":252,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水监测点扎点@3x":{"x":294,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
 }
diff --git a/public/static/libs/mapbox/style/sprite/sprite.png b/public/static/libs/mapbox/style/sprite/sprite.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.png
+++ b/public/static/libs/mapbox/style/sprite/sprite.png
Binary files differ
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 4e53377..4d288f5 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -463,4 +463,4 @@
     method: 'get',
     params: query
   })
-}
+}
\ No newline at end of file
diff --git a/src/assets/images/pictureOnMap/leftBZ.png b/src/assets/images/pictureOnMap/leftBZ.png
new file mode 100644
index 0000000..1af9f89
--- /dev/null
+++ b/src/assets/images/pictureOnMap/leftBZ.png
Binary files differ
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index cb99f34..ecea8c4 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -41,6 +41,7 @@
 import { LineLayer, GeoJsonLayer } from "@deck.gl/layers";
 import { TripsLayer, Tile3DLayer } from "@deck.gl/geo-layers";
 import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
+const baseUrl = import.meta.env.VITE_APP_MAP_BASE_API || "";
 const appStore = useUserStore();
 const MapShow = ref(true);
 const props = defineProps({
@@ -448,10 +449,10 @@
     let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0];
     outlet && outletRouteMethod({id:String(outlet.dataId)},false);
 
-    let lake = relationDataList.filter(i => i.dataCode == keys[2])[0];
-    let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i));
+    let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean);
+    let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i));
     features.forEach(k => (k.properties.type = undefined))
-      lake &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
+    relationIds &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
     busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true });
   }
 
@@ -817,13 +818,17 @@
   const { setLayerVisible, beansToMap } = events_params;
   const fullnessColor = (value) => {
     value = Number(value);
-    const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
+    if(!(location.href.includes('dhgx.'))) value = _.random(60,100);
+    const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
     return (colors.filter((i,idx) => idx!= colors.length-1 && i.value<value && value<colors[idx+1].value)[0] || colors[colors.length-1]).color;
   }
   const nameConcat = (item)=>{
     return (({
       lake_water_level:()=>{
         return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
+      },
+      waterlogging:()=>{
+        return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
       }
     })[item.pointType] || (()=> item.name))();
   }
@@ -852,7 +857,7 @@
     fullness:{
       method:getPipeMonitorRun,
       fields:{geometry:"pipelineGeometry",name:"name"},
-      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:4,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
+      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:8,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
     }
   };
   const other_data_params = {};
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 634846e..ac19187 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -4,7 +4,7 @@
       class="layericon"
       @click="allData.showControlBox = !allData.showControlBox"
     ></div>
-    <div class="layericon-back" @click="areaBack" v-show="isShowBack">返回</div>
+    <div class="layericon-back" @click="areaBack()" v-show="isShowBack">返回</div>
     <div class="LayerControlBox" v-show="allData.showControlBox">
       <div class="ControlBox-body">
         <el-tree
@@ -256,7 +256,7 @@
   pipeNetworkFilling:{
     title:'管网充满度(%)',
     data:[
-      { name: "0-60", color: "rgba(52,176,0,1)" },
+      { name: "0-60", color: "rgba(52,176,0,.1)" },
       { name: "60-70", color: "rgba(254,203,0,1)" },
       { name: "70-90", color: "rgba(223,1,0,1)" },
       { name: ">90", color: "rgba(142,14,11,1)" },
@@ -271,6 +271,7 @@
 });
 
 function areaBack() {
+  debugger;
   backObj.value.name == '1'?  (bus.emit("clearTemporaryData"),bus.emit(mapInitBusName),backObj.value = null) :  bus.emit("panelDataToMap", backObj.value);
 }
 
@@ -630,7 +631,7 @@
     width:12px;
     height:12px;
     margin-right: 5px;
-    
   }
+
   }
 </style>

diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
index 9afe894..af9fff2 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
Binary files differ
diff --git a/public/static/libs/mapbox/style/sprite/sprite.json b/public/static/libs/mapbox/style/sprite/sprite.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.json
+++ b/public/static/libs/mapbox/style/sprite/sprite.json
@@ -260,43 +260,45 @@
   "雨水泵站扎点@2x":{"x":28,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网水质扎点@2x":{"x":56,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网液位扎点@2x":{"x":84,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x(1)":{"x":112,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x":{"x":140,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@2x":{"x":168,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "wsc1":{"x":196,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x(1)":{"x":236,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x":{"x":278,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x(1)":{"x":320,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x":{"x":362,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分区信息扎点@3x":{"x":404,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水位扎点@3x":{"x":446,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水质扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河湖溢流风险口扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河流渠道扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊水位扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "接驳口扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口水质扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x(1)":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水户扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水护扎点@3x":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库范围i扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x(1)":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x(1)":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水厂扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水处理厂扎点@3x":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水管网水质扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨量站扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x(1)":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网水质扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网液位扎点@3x":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x(1)":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
+  "wsc1":{"x":112,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@2x(1)":{"x":152,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点@2x":{"x":194,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点_告警@2x":{"x":236,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点@2x":{"x":278,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点_告警@2x":{"x":319,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "调蓄池扎点@3x(1)":{"x":360,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "调蓄池扎点@3x":{"x":402,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x(1)":{"x":444,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分区信息扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水位扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水质扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河湖溢流风险口扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河流渠道扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊水位扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊扎点@3x":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "接驳口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口水质扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x(1)":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水户扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水护扎点@3x":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库范围i扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库扎点@3x":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x(1)":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x(1)":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水厂扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水处理厂扎点@3x":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水管网水质扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨量站扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x(1)":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网水质扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网液位扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x(1)":{"x":210,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x":{"x":252,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水监测点扎点@3x":{"x":294,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
 }
diff --git a/public/static/libs/mapbox/style/sprite/sprite.png b/public/static/libs/mapbox/style/sprite/sprite.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.png
+++ b/public/static/libs/mapbox/style/sprite/sprite.png
Binary files differ
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 4e53377..4d288f5 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -463,4 +463,4 @@
     method: 'get',
     params: query
   })
-}
+}
\ No newline at end of file
diff --git a/src/assets/images/pictureOnMap/leftBZ.png b/src/assets/images/pictureOnMap/leftBZ.png
new file mode 100644
index 0000000..1af9f89
--- /dev/null
+++ b/src/assets/images/pictureOnMap/leftBZ.png
Binary files differ
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index cb99f34..ecea8c4 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -41,6 +41,7 @@
 import { LineLayer, GeoJsonLayer } from "@deck.gl/layers";
 import { TripsLayer, Tile3DLayer } from "@deck.gl/geo-layers";
 import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
+const baseUrl = import.meta.env.VITE_APP_MAP_BASE_API || "";
 const appStore = useUserStore();
 const MapShow = ref(true);
 const props = defineProps({
@@ -448,10 +449,10 @@
     let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0];
     outlet && outletRouteMethod({id:String(outlet.dataId)},false);
 
-    let lake = relationDataList.filter(i => i.dataCode == keys[2])[0];
-    let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i));
+    let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean);
+    let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i));
     features.forEach(k => (k.properties.type = undefined))
-      lake &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
+    relationIds &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
     busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true });
   }
 
@@ -817,13 +818,17 @@
   const { setLayerVisible, beansToMap } = events_params;
   const fullnessColor = (value) => {
     value = Number(value);
-    const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
+    if(!(location.href.includes('dhgx.'))) value = _.random(60,100);
+    const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
     return (colors.filter((i,idx) => idx!= colors.length-1 && i.value<value && value<colors[idx+1].value)[0] || colors[colors.length-1]).color;
   }
   const nameConcat = (item)=>{
     return (({
       lake_water_level:()=>{
         return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
+      },
+      waterlogging:()=>{
+        return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
       }
     })[item.pointType] || (()=> item.name))();
   }
@@ -852,7 +857,7 @@
     fullness:{
       method:getPipeMonitorRun,
       fields:{geometry:"pipelineGeometry",name:"name"},
-      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:4,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
+      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:8,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
     }
   };
   const other_data_params = {};
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 634846e..ac19187 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -4,7 +4,7 @@
       class="layericon"
       @click="allData.showControlBox = !allData.showControlBox"
     ></div>
-    <div class="layericon-back" @click="areaBack" v-show="isShowBack">返回</div>
+    <div class="layericon-back" @click="areaBack()" v-show="isShowBack">返回</div>
     <div class="LayerControlBox" v-show="allData.showControlBox">
       <div class="ControlBox-body">
         <el-tree
@@ -256,7 +256,7 @@
   pipeNetworkFilling:{
     title:'管网充满度(%)',
     data:[
-      { name: "0-60", color: "rgba(52,176,0,1)" },
+      { name: "0-60", color: "rgba(52,176,0,.1)" },
       { name: "60-70", color: "rgba(254,203,0,1)" },
       { name: "70-90", color: "rgba(223,1,0,1)" },
       { name: ">90", color: "rgba(142,14,11,1)" },
@@ -271,6 +271,7 @@
 });
 
 function areaBack() {
+  debugger;
   backObj.value.name == '1'?  (bus.emit("clearTemporaryData"),bus.emit(mapInitBusName),backObj.value = null) :  bus.emit("panelDataToMap", backObj.value);
 }
 
@@ -630,7 +631,7 @@
     width:12px;
     height:12px;
     margin-right: 5px;
-    
   }
+
   }
 </style>
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 83d1fbd..741e66c 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -104,6 +104,8 @@
   'plcSewagePumpStation', //plc污水泵站
   'plcRainPumpStation', //plc雨水泵站
   "plcGateStation",//plc水闸
+
+  
 ]);
 // 基本数据
 const arrid = ref([
@@ -453,7 +455,20 @@
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : '' || 1;
+   let type = properties ? properties.type : '' || 1;
+  // 针对调度辅助决策易渍水点做的判断
+  let fzjcArr=['waterlog_community_text','waterloggingPointRelation']
+    if(fzjcArr.includes(properties.type)){
+      // 调度辅助决策易渍水点上图统一类型
+      type=properties._image
+      if(!Object.keys(properties).includes('stCode')){
+      properties.stCode=properties.dataCode
+      }
+      if(!Object.keys(properties).includes('id')){
+     properties.id=properties.dataId
+      }
+    }
+ 
   let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
   console.log('1111', type, layerId);

diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
index 9afe894..af9fff2 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
Binary files differ
diff --git a/public/static/libs/mapbox/style/sprite/sprite.json b/public/static/libs/mapbox/style/sprite/sprite.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.json
+++ b/public/static/libs/mapbox/style/sprite/sprite.json
@@ -260,43 +260,45 @@
   "雨水泵站扎点@2x":{"x":28,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网水质扎点@2x":{"x":56,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网液位扎点@2x":{"x":84,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x(1)":{"x":112,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x":{"x":140,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@2x":{"x":168,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "wsc1":{"x":196,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x(1)":{"x":236,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x":{"x":278,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x(1)":{"x":320,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x":{"x":362,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分区信息扎点@3x":{"x":404,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水位扎点@3x":{"x":446,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水质扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河湖溢流风险口扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河流渠道扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊水位扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "接驳口扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口水质扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x(1)":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水户扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水护扎点@3x":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库范围i扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x(1)":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x(1)":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水厂扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水处理厂扎点@3x":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水管网水质扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨量站扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x(1)":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网水质扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网液位扎点@3x":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x(1)":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
+  "wsc1":{"x":112,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@2x(1)":{"x":152,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点@2x":{"x":194,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点_告警@2x":{"x":236,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点@2x":{"x":278,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点_告警@2x":{"x":319,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "调蓄池扎点@3x(1)":{"x":360,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "调蓄池扎点@3x":{"x":402,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x(1)":{"x":444,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分区信息扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水位扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水质扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河湖溢流风险口扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河流渠道扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊水位扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊扎点@3x":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "接驳口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口水质扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x(1)":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水户扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水护扎点@3x":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库范围i扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库扎点@3x":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x(1)":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x(1)":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水厂扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水处理厂扎点@3x":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水管网水质扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨量站扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x(1)":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网水质扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网液位扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x(1)":{"x":210,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x":{"x":252,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水监测点扎点@3x":{"x":294,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
 }
diff --git a/public/static/libs/mapbox/style/sprite/sprite.png b/public/static/libs/mapbox/style/sprite/sprite.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.png
+++ b/public/static/libs/mapbox/style/sprite/sprite.png
Binary files differ
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 4e53377..4d288f5 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -463,4 +463,4 @@
     method: 'get',
     params: query
   })
-}
+}
\ No newline at end of file
diff --git a/src/assets/images/pictureOnMap/leftBZ.png b/src/assets/images/pictureOnMap/leftBZ.png
new file mode 100644
index 0000000..1af9f89
--- /dev/null
+++ b/src/assets/images/pictureOnMap/leftBZ.png
Binary files differ
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index cb99f34..ecea8c4 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -41,6 +41,7 @@
 import { LineLayer, GeoJsonLayer } from "@deck.gl/layers";
 import { TripsLayer, Tile3DLayer } from "@deck.gl/geo-layers";
 import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
+const baseUrl = import.meta.env.VITE_APP_MAP_BASE_API || "";
 const appStore = useUserStore();
 const MapShow = ref(true);
 const props = defineProps({
@@ -448,10 +449,10 @@
     let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0];
     outlet && outletRouteMethod({id:String(outlet.dataId)},false);
 
-    let lake = relationDataList.filter(i => i.dataCode == keys[2])[0];
-    let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i));
+    let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean);
+    let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i));
     features.forEach(k => (k.properties.type = undefined))
-      lake &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
+    relationIds &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
     busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true });
   }
 
@@ -817,13 +818,17 @@
   const { setLayerVisible, beansToMap } = events_params;
   const fullnessColor = (value) => {
     value = Number(value);
-    const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
+    if(!(location.href.includes('dhgx.'))) value = _.random(60,100);
+    const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
     return (colors.filter((i,idx) => idx!= colors.length-1 && i.value<value && value<colors[idx+1].value)[0] || colors[colors.length-1]).color;
   }
   const nameConcat = (item)=>{
     return (({
       lake_water_level:()=>{
         return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
+      },
+      waterlogging:()=>{
+        return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
       }
     })[item.pointType] || (()=> item.name))();
   }
@@ -852,7 +857,7 @@
     fullness:{
       method:getPipeMonitorRun,
       fields:{geometry:"pipelineGeometry",name:"name"},
-      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:4,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
+      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:8,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
     }
   };
   const other_data_params = {};
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 634846e..ac19187 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -4,7 +4,7 @@
       class="layericon"
       @click="allData.showControlBox = !allData.showControlBox"
     ></div>
-    <div class="layericon-back" @click="areaBack" v-show="isShowBack">返回</div>
+    <div class="layericon-back" @click="areaBack()" v-show="isShowBack">返回</div>
     <div class="LayerControlBox" v-show="allData.showControlBox">
       <div class="ControlBox-body">
         <el-tree
@@ -256,7 +256,7 @@
   pipeNetworkFilling:{
     title:'管网充满度(%)',
     data:[
-      { name: "0-60", color: "rgba(52,176,0,1)" },
+      { name: "0-60", color: "rgba(52,176,0,.1)" },
       { name: "60-70", color: "rgba(254,203,0,1)" },
       { name: "70-90", color: "rgba(223,1,0,1)" },
       { name: ">90", color: "rgba(142,14,11,1)" },
@@ -271,6 +271,7 @@
 });
 
 function areaBack() {
+  debugger;
   backObj.value.name == '1'?  (bus.emit("clearTemporaryData"),bus.emit(mapInitBusName),backObj.value = null) :  bus.emit("panelDataToMap", backObj.value);
 }
 
@@ -630,7 +631,7 @@
     width:12px;
     height:12px;
     margin-right: 5px;
-    
   }
+
   }
 </style>
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 83d1fbd..741e66c 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -104,6 +104,8 @@
   'plcSewagePumpStation', //plc污水泵站
   'plcRainPumpStation', //plc雨水泵站
   "plcGateStation",//plc水闸
+
+  
 ]);
 // 基本数据
 const arrid = ref([
@@ -453,7 +455,20 @@
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : '' || 1;
+   let type = properties ? properties.type : '' || 1;
+  // 针对调度辅助决策易渍水点做的判断
+  let fzjcArr=['waterlog_community_text','waterloggingPointRelation']
+    if(fzjcArr.includes(properties.type)){
+      // 调度辅助决策易渍水点上图统一类型
+      type=properties._image
+      if(!Object.keys(properties).includes('stCode')){
+      properties.stCode=properties.dataCode
+      }
+      if(!Object.keys(properties).includes('id')){
+     properties.id=properties.dataId
+      }
+    }
+ 
   let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
   console.log('1111', type, layerId);
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
index be8266a..140f6d4 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
@@ -2,7 +2,47 @@
   <!-- 监测预警  泵站工情 -->
   <div class="Bzgq flex flex-v">
     <div class="flex flex-wrap" style="gap: 10px;">
-      <div class="sumShow">
+      <div class="chunkBox flex ">
+        <div class="leftinfoCon">
+          <div class="bzzs">泵站总数({{sumObj.totalNum}})</div>
+          <div class="dqbzkb">当前泵机开泵</div>
+          <div class="rzcppl">今日总抽排排量</div>
+          <div class="cqpsw">超起排水位</div>
+        </div>
+        <div class="rightinfoCon ">
+          <div class="acrossBox acrossBox1 flex flex-justcontent-spacearound">
+            <div style="color:rgba(44, 183, 255, 1)">雨水泵站</div>
+            <div style="color:rgba(254, 103, 128, 1)">污水泵站</div>
+          </div>
+          <div class="acrossBox acrossBox2 flex flex-justcontent-spacearound">
+            <div>{{sumObj.rainPumpNum}}</div>
+            <div>{{sumObj.sewagePumpNum}}</div>
+          </div>
+          <div class="acrossBox acrossBox3 flex flex-justcontent-spacearound">
+            <div>{{sumObj.openPumpMachineNum}}/{{sumObj.pumpMachineNum}}</div>
+          </div>
+          <div class="acrossBox acrossBox4 flex flex-justcontent-spacearound">
+            <div>{{sumObj.rainOpenPumpMachineNum}}/{{sumObj.rainPumpMachineNum}}</div>
+            <div>{{sumObj.sewageOpenPumpMachineNum}}/{{sumObj.sewagePumpMachineNum}}</div>
+          </div>
+          <div class="acrossBox acrossBox5 flex flex-justcontent-spacearound">
+            <div v-if="sumObj.todayTotalCpl>=0">{{sumObj.todayTotalCpl+'万方'}}</div>
+            <div v-else>--</div>
+          </div>
+          <div class="acrossBox acrossBox6 flex flex-justcontent-spacearound">
+            <div v-if="sumObj.rainPumpTodayTotalCpl>=0">{{sumObj.rainPumpTodayTotalCpl+'万方'}}</div>
+            <div v-else>--</div>
+            <div v-if="sumObj.sewagePumpTodayTotalCpl>=0">{{sumObj.sewagePumpTodayTotalCpl+'万方'}}</div>
+            <div v-else>--</div>
+          </div>
+          <div class="acrossBox acrossBox7 flex flex-justcontent-spacearound">
+            <div>{{sumObj.cqcswNum}}</div>
+          </div>
+        </div>
+      </div>
+
+
+      <!-- <div class="sumShow">
       <div class="eachSum">
         <div class="distext flex flex-justcontent-spacebetween">
           <div class="textLeft">泵站总数</div>
@@ -89,7 +129,7 @@
         </div>
       
       </div>
-    </div>
+    </div> -->
     </div>
     
     
@@ -99,8 +139,13 @@
       <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
         <div class="topCon">
           <div class="leftCon">
-            <div class="dingweiicon" :class="item.stType=='plcRainPumpStation'?'YSBZicon':'WSBZicon'"></div>
-            <div>{{item.name}}</div>
+            <div class="dingweiicon"  :class="item.stType=='plcRainPumpStation'?'YSBZicon':'WSBZicon'"></div>
+            <div class="nameText" :title="item.name">{{item.name}}</div>
+            <div class="loadText">
+              <span>(负载：</span>
+              <span :style="{color:loadFun(item)}">{{(Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100).toFixed(0)}}%</span>
+              <span>)</span>
+            </div>
             <!-- <div class="equipmentStats onColor" v-if="item.status=='1'">在线</div>
             <div class="equipmentStats offColor" v-else>离线</div> -->
           </div>
@@ -180,6 +225,19 @@
     }
   });
 }
+// 计算负荷
+function loadFun(item){
+  // openPumpNum/pumpNumber
+     let sum = (Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100)
+if(sum<=100&&sum>75){
+  return 'rgba(254, 103, 128, 1)'
+}else if(sum<=75&&sum>=50){
+  return 'rgba(254, 227, 103, 1)'
+
+}else if(sum<50){
+return 'rgba(0, 247, 251, 1)'
+}
+}
 onMounted(() => {
   gitDataList()
   gitDataFun()
@@ -188,6 +246,75 @@
 <style lang="scss" scoped>
 .Bzgq {
      height: calc(100% - 100px);
+     .chunkBox {
+      height: 217px;
+      .leftinfoCon {
+        width: 140px;
+        height: 100%;
+        text-align: center;
+            background: url('@/assets/images/pictureOnMap/leftBZ.png') no-repeat center;
+             background-size: 100% 100%;
+             font-weight: 500;
+font-size: 16px;
+color: #FFFFFF;
+        .bzzs {
+          padding-top: 18px;
+        }
+        .dqbzkb {
+          padding-top:34px;
+
+        }
+        .rzcppl {
+          padding-top: 35px;
+
+        }
+        .cqpsw {
+          padding-top: 26px;
+
+        }
+      }
+      .rightinfoCon {
+        width: 279px;
+        border: 1px solid #4AB5FF;
+        box-sizing: border-box;
+        margin-left: 9px;
+        .acrossBox {
+          border-bottom: 1px solid #0B9BFF;
+          align-items: center;
+          font-weight: 500;
+font-size: 16px;
+color: #D2E2FF;
+        }
+        .acrossBox1 {
+          height: 31px;
+        }
+        .acrossBox2 {
+          height: 29px;
+        }
+        .acrossBox3 {
+          height: 31px;
+        }
+        .acrossBox4 {
+          height: 28px;
+        }
+        .acrossBox5 {
+          height: 31px;
+        }
+        .acrossBox6 {
+          height: 28px;
+        }
+        .acrossBox7 {
+          height: 37px;
+        }
+        .acrossBox:nth-child(odd){
+          background: linear-gradient(0deg, rgba(0,98,183,0.8) 0%, rgba(0,98,183,0.1) 100%);
+        }
+
+        .acrossBox:last-child {
+          border-bottom: 0;
+        }
+      }
+     }
   .sumShow {
     width: 206px;
     height: 75px;
@@ -274,17 +401,24 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
-            max-width: 250px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
-          }
+
           .dingweiicon {
             width: 17px;
             height: 17px;
             margin-top: 2px;
             margin-right: 5px;
+           
+          }
+           .nameText {
+               max-width: 180px;
+               overflow: hidden; //溢出隐藏
+          text-overflow: ellipsis; //超出显示省略号
+          white-space: nowrap; //强制文本在一行内显示
+            }
+          .loadText {
+            font-weight: 400;
+font-size: 14px;
+color: #CCDFFF;
           }
           .YSBZicon {
             background: url('@/assets/images/pictureOnMap/YSBZicon.png') no-repeat center;

diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
index 9afe894..af9fff2 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
Binary files differ
diff --git a/public/static/libs/mapbox/style/sprite/sprite.json b/public/static/libs/mapbox/style/sprite/sprite.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.json
+++ b/public/static/libs/mapbox/style/sprite/sprite.json
@@ -260,43 +260,45 @@
   "雨水泵站扎点@2x":{"x":28,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网水质扎点@2x":{"x":56,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网液位扎点@2x":{"x":84,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x(1)":{"x":112,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x":{"x":140,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@2x":{"x":168,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "wsc1":{"x":196,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x(1)":{"x":236,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x":{"x":278,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x(1)":{"x":320,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x":{"x":362,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分区信息扎点@3x":{"x":404,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水位扎点@3x":{"x":446,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水质扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河湖溢流风险口扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河流渠道扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊水位扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "接驳口扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口水质扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x(1)":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水户扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水护扎点@3x":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库范围i扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x(1)":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x(1)":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水厂扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水处理厂扎点@3x":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水管网水质扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨量站扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x(1)":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网水质扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网液位扎点@3x":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x(1)":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
+  "wsc1":{"x":112,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@2x(1)":{"x":152,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点@2x":{"x":194,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点_告警@2x":{"x":236,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点@2x":{"x":278,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点_告警@2x":{"x":319,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "调蓄池扎点@3x(1)":{"x":360,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "调蓄池扎点@3x":{"x":402,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x(1)":{"x":444,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分区信息扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水位扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水质扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河湖溢流风险口扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河流渠道扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊水位扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊扎点@3x":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "接驳口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口水质扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x(1)":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水户扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水护扎点@3x":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库范围i扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库扎点@3x":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x(1)":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x(1)":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水厂扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水处理厂扎点@3x":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水管网水质扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨量站扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x(1)":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网水质扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网液位扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x(1)":{"x":210,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x":{"x":252,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水监测点扎点@3x":{"x":294,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
 }
diff --git a/public/static/libs/mapbox/style/sprite/sprite.png b/public/static/libs/mapbox/style/sprite/sprite.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.png
+++ b/public/static/libs/mapbox/style/sprite/sprite.png
Binary files differ
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 4e53377..4d288f5 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -463,4 +463,4 @@
     method: 'get',
     params: query
   })
-}
+}
\ No newline at end of file
diff --git a/src/assets/images/pictureOnMap/leftBZ.png b/src/assets/images/pictureOnMap/leftBZ.png
new file mode 100644
index 0000000..1af9f89
--- /dev/null
+++ b/src/assets/images/pictureOnMap/leftBZ.png
Binary files differ
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index cb99f34..ecea8c4 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -41,6 +41,7 @@
 import { LineLayer, GeoJsonLayer } from "@deck.gl/layers";
 import { TripsLayer, Tile3DLayer } from "@deck.gl/geo-layers";
 import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
+const baseUrl = import.meta.env.VITE_APP_MAP_BASE_API || "";
 const appStore = useUserStore();
 const MapShow = ref(true);
 const props = defineProps({
@@ -448,10 +449,10 @@
     let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0];
     outlet && outletRouteMethod({id:String(outlet.dataId)},false);
 
-    let lake = relationDataList.filter(i => i.dataCode == keys[2])[0];
-    let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i));
+    let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean);
+    let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i));
     features.forEach(k => (k.properties.type = undefined))
-      lake &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
+    relationIds &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
     busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true });
   }
 
@@ -817,13 +818,17 @@
   const { setLayerVisible, beansToMap } = events_params;
   const fullnessColor = (value) => {
     value = Number(value);
-    const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
+    if(!(location.href.includes('dhgx.'))) value = _.random(60,100);
+    const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
     return (colors.filter((i,idx) => idx!= colors.length-1 && i.value<value && value<colors[idx+1].value)[0] || colors[colors.length-1]).color;
   }
   const nameConcat = (item)=>{
     return (({
       lake_water_level:()=>{
         return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
+      },
+      waterlogging:()=>{
+        return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
       }
     })[item.pointType] || (()=> item.name))();
   }
@@ -852,7 +857,7 @@
     fullness:{
       method:getPipeMonitorRun,
       fields:{geometry:"pipelineGeometry",name:"name"},
-      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:4,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
+      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:8,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
     }
   };
   const other_data_params = {};
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 634846e..ac19187 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -4,7 +4,7 @@
       class="layericon"
       @click="allData.showControlBox = !allData.showControlBox"
     ></div>
-    <div class="layericon-back" @click="areaBack" v-show="isShowBack">返回</div>
+    <div class="layericon-back" @click="areaBack()" v-show="isShowBack">返回</div>
     <div class="LayerControlBox" v-show="allData.showControlBox">
       <div class="ControlBox-body">
         <el-tree
@@ -256,7 +256,7 @@
   pipeNetworkFilling:{
     title:'管网充满度(%)',
     data:[
-      { name: "0-60", color: "rgba(52,176,0,1)" },
+      { name: "0-60", color: "rgba(52,176,0,.1)" },
       { name: "60-70", color: "rgba(254,203,0,1)" },
       { name: "70-90", color: "rgba(223,1,0,1)" },
       { name: ">90", color: "rgba(142,14,11,1)" },
@@ -271,6 +271,7 @@
 });
 
 function areaBack() {
+  debugger;
   backObj.value.name == '1'?  (bus.emit("clearTemporaryData"),bus.emit(mapInitBusName),backObj.value = null) :  bus.emit("panelDataToMap", backObj.value);
 }
 
@@ -630,7 +631,7 @@
     width:12px;
     height:12px;
     margin-right: 5px;
-    
   }
+
   }
 </style>
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 83d1fbd..741e66c 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -104,6 +104,8 @@
   'plcSewagePumpStation', //plc污水泵站
   'plcRainPumpStation', //plc雨水泵站
   "plcGateStation",//plc水闸
+
+  
 ]);
 // 基本数据
 const arrid = ref([
@@ -453,7 +455,20 @@
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : '' || 1;
+   let type = properties ? properties.type : '' || 1;
+  // 针对调度辅助决策易渍水点做的判断
+  let fzjcArr=['waterlog_community_text','waterloggingPointRelation']
+    if(fzjcArr.includes(properties.type)){
+      // 调度辅助决策易渍水点上图统一类型
+      type=properties._image
+      if(!Object.keys(properties).includes('stCode')){
+      properties.stCode=properties.dataCode
+      }
+      if(!Object.keys(properties).includes('id')){
+     properties.id=properties.dataId
+      }
+    }
+ 
   let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
   console.log('1111', type, layerId);
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
index be8266a..140f6d4 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
@@ -2,7 +2,47 @@
   <!-- 监测预警  泵站工情 -->
   <div class="Bzgq flex flex-v">
     <div class="flex flex-wrap" style="gap: 10px;">
-      <div class="sumShow">
+      <div class="chunkBox flex ">
+        <div class="leftinfoCon">
+          <div class="bzzs">泵站总数({{sumObj.totalNum}})</div>
+          <div class="dqbzkb">当前泵机开泵</div>
+          <div class="rzcppl">今日总抽排排量</div>
+          <div class="cqpsw">超起排水位</div>
+        </div>
+        <div class="rightinfoCon ">
+          <div class="acrossBox acrossBox1 flex flex-justcontent-spacearound">
+            <div style="color:rgba(44, 183, 255, 1)">雨水泵站</div>
+            <div style="color:rgba(254, 103, 128, 1)">污水泵站</div>
+          </div>
+          <div class="acrossBox acrossBox2 flex flex-justcontent-spacearound">
+            <div>{{sumObj.rainPumpNum}}</div>
+            <div>{{sumObj.sewagePumpNum}}</div>
+          </div>
+          <div class="acrossBox acrossBox3 flex flex-justcontent-spacearound">
+            <div>{{sumObj.openPumpMachineNum}}/{{sumObj.pumpMachineNum}}</div>
+          </div>
+          <div class="acrossBox acrossBox4 flex flex-justcontent-spacearound">
+            <div>{{sumObj.rainOpenPumpMachineNum}}/{{sumObj.rainPumpMachineNum}}</div>
+            <div>{{sumObj.sewageOpenPumpMachineNum}}/{{sumObj.sewagePumpMachineNum}}</div>
+          </div>
+          <div class="acrossBox acrossBox5 flex flex-justcontent-spacearound">
+            <div v-if="sumObj.todayTotalCpl>=0">{{sumObj.todayTotalCpl+'万方'}}</div>
+            <div v-else>--</div>
+          </div>
+          <div class="acrossBox acrossBox6 flex flex-justcontent-spacearound">
+            <div v-if="sumObj.rainPumpTodayTotalCpl>=0">{{sumObj.rainPumpTodayTotalCpl+'万方'}}</div>
+            <div v-else>--</div>
+            <div v-if="sumObj.sewagePumpTodayTotalCpl>=0">{{sumObj.sewagePumpTodayTotalCpl+'万方'}}</div>
+            <div v-else>--</div>
+          </div>
+          <div class="acrossBox acrossBox7 flex flex-justcontent-spacearound">
+            <div>{{sumObj.cqcswNum}}</div>
+          </div>
+        </div>
+      </div>
+
+
+      <!-- <div class="sumShow">
       <div class="eachSum">
         <div class="distext flex flex-justcontent-spacebetween">
           <div class="textLeft">泵站总数</div>
@@ -89,7 +129,7 @@
         </div>
       
       </div>
-    </div>
+    </div> -->
     </div>
     
     
@@ -99,8 +139,13 @@
       <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
         <div class="topCon">
           <div class="leftCon">
-            <div class="dingweiicon" :class="item.stType=='plcRainPumpStation'?'YSBZicon':'WSBZicon'"></div>
-            <div>{{item.name}}</div>
+            <div class="dingweiicon"  :class="item.stType=='plcRainPumpStation'?'YSBZicon':'WSBZicon'"></div>
+            <div class="nameText" :title="item.name">{{item.name}}</div>
+            <div class="loadText">
+              <span>(负载：</span>
+              <span :style="{color:loadFun(item)}">{{(Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100).toFixed(0)}}%</span>
+              <span>)</span>
+            </div>
             <!-- <div class="equipmentStats onColor" v-if="item.status=='1'">在线</div>
             <div class="equipmentStats offColor" v-else>离线</div> -->
           </div>
@@ -180,6 +225,19 @@
     }
   });
 }
+// 计算负荷
+function loadFun(item){
+  // openPumpNum/pumpNumber
+     let sum = (Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100)
+if(sum<=100&&sum>75){
+  return 'rgba(254, 103, 128, 1)'
+}else if(sum<=75&&sum>=50){
+  return 'rgba(254, 227, 103, 1)'
+
+}else if(sum<50){
+return 'rgba(0, 247, 251, 1)'
+}
+}
 onMounted(() => {
   gitDataList()
   gitDataFun()
@@ -188,6 +246,75 @@
 <style lang="scss" scoped>
 .Bzgq {
      height: calc(100% - 100px);
+     .chunkBox {
+      height: 217px;
+      .leftinfoCon {
+        width: 140px;
+        height: 100%;
+        text-align: center;
+            background: url('@/assets/images/pictureOnMap/leftBZ.png') no-repeat center;
+             background-size: 100% 100%;
+             font-weight: 500;
+font-size: 16px;
+color: #FFFFFF;
+        .bzzs {
+          padding-top: 18px;
+        }
+        .dqbzkb {
+          padding-top:34px;
+
+        }
+        .rzcppl {
+          padding-top: 35px;
+
+        }
+        .cqpsw {
+          padding-top: 26px;
+
+        }
+      }
+      .rightinfoCon {
+        width: 279px;
+        border: 1px solid #4AB5FF;
+        box-sizing: border-box;
+        margin-left: 9px;
+        .acrossBox {
+          border-bottom: 1px solid #0B9BFF;
+          align-items: center;
+          font-weight: 500;
+font-size: 16px;
+color: #D2E2FF;
+        }
+        .acrossBox1 {
+          height: 31px;
+        }
+        .acrossBox2 {
+          height: 29px;
+        }
+        .acrossBox3 {
+          height: 31px;
+        }
+        .acrossBox4 {
+          height: 28px;
+        }
+        .acrossBox5 {
+          height: 31px;
+        }
+        .acrossBox6 {
+          height: 28px;
+        }
+        .acrossBox7 {
+          height: 37px;
+        }
+        .acrossBox:nth-child(odd){
+          background: linear-gradient(0deg, rgba(0,98,183,0.8) 0%, rgba(0,98,183,0.1) 100%);
+        }
+
+        .acrossBox:last-child {
+          border-bottom: 0;
+        }
+      }
+     }
   .sumShow {
     width: 206px;
     height: 75px;
@@ -274,17 +401,24 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
-            max-width: 250px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
-          }
+
           .dingweiicon {
             width: 17px;
             height: 17px;
             margin-top: 2px;
             margin-right: 5px;
+           
+          }
+           .nameText {
+               max-width: 180px;
+               overflow: hidden; //溢出隐藏
+          text-overflow: ellipsis; //超出显示省略号
+          white-space: nowrap; //强制文本在一行内显示
+            }
+          .loadText {
+            font-weight: 400;
+font-size: 14px;
+color: #CCDFFF;
           }
           .YSBZicon {
             background: url('@/assets/images/pictureOnMap/YSBZicon.png') no-repeat center;
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Szgk.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Szgk.vue
index 49c1d6c..69111d1 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Szgk.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Szgk.vue
@@ -34,7 +34,10 @@
          <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{ item.stName }}</div>
+            <div class="name" :title="item.stName">
+              <span>{{ item.stName }}</span>
+              <span v-if="item.waterLevel>=0" class="yeweiSum" >液位：{{item.waterLevel+'m'}}</span>
+            </div>
           </div>
           <div class="equipmentStats colorGreen" v-if="item.onlineStatus == 'online'">
             在线
@@ -200,12 +203,19 @@
             text-overflow: ellipsis; //超出显示省略号
             white-space: nowrap; //强制文本在一行内显示
           }
+           .yeweiSum {
+              padding-left: 10px;
+                          font-weight: 400;
+font-size: 14px;
+color: #CCDFFF;
+            }
           .dingweiicon {
             width: 25px;
             height: 28px;
             background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
               center;
             background-size: 100% 100%;
+           
           }
         }
         .equipmentStats {

diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
index 9afe894..af9fff2 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
Binary files differ
diff --git a/public/static/libs/mapbox/style/sprite/sprite.json b/public/static/libs/mapbox/style/sprite/sprite.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.json
+++ b/public/static/libs/mapbox/style/sprite/sprite.json
@@ -260,43 +260,45 @@
   "雨水泵站扎点@2x":{"x":28,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网水质扎点@2x":{"x":56,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网液位扎点@2x":{"x":84,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x(1)":{"x":112,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x":{"x":140,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@2x":{"x":168,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "wsc1":{"x":196,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x(1)":{"x":236,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x":{"x":278,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x(1)":{"x":320,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x":{"x":362,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分区信息扎点@3x":{"x":404,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水位扎点@3x":{"x":446,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水质扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河湖溢流风险口扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河流渠道扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊水位扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "接驳口扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口水质扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x(1)":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水户扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水护扎点@3x":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库范围i扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x(1)":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x(1)":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水厂扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水处理厂扎点@3x":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水管网水质扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨量站扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x(1)":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网水质扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网液位扎点@3x":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x(1)":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
+  "wsc1":{"x":112,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@2x(1)":{"x":152,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点@2x":{"x":194,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点_告警@2x":{"x":236,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点@2x":{"x":278,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点_告警@2x":{"x":319,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "调蓄池扎点@3x(1)":{"x":360,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "调蓄池扎点@3x":{"x":402,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x(1)":{"x":444,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分区信息扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水位扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水质扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河湖溢流风险口扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河流渠道扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊水位扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊扎点@3x":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "接驳口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口水质扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x(1)":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水户扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水护扎点@3x":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库范围i扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库扎点@3x":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x(1)":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x(1)":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水厂扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水处理厂扎点@3x":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水管网水质扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨量站扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x(1)":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网水质扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网液位扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x(1)":{"x":210,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x":{"x":252,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水监测点扎点@3x":{"x":294,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
 }
diff --git a/public/static/libs/mapbox/style/sprite/sprite.png b/public/static/libs/mapbox/style/sprite/sprite.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.png
+++ b/public/static/libs/mapbox/style/sprite/sprite.png
Binary files differ
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 4e53377..4d288f5 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -463,4 +463,4 @@
     method: 'get',
     params: query
   })
-}
+}
\ No newline at end of file
diff --git a/src/assets/images/pictureOnMap/leftBZ.png b/src/assets/images/pictureOnMap/leftBZ.png
new file mode 100644
index 0000000..1af9f89
--- /dev/null
+++ b/src/assets/images/pictureOnMap/leftBZ.png
Binary files differ
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index cb99f34..ecea8c4 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -41,6 +41,7 @@
 import { LineLayer, GeoJsonLayer } from "@deck.gl/layers";
 import { TripsLayer, Tile3DLayer } from "@deck.gl/geo-layers";
 import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
+const baseUrl = import.meta.env.VITE_APP_MAP_BASE_API || "";
 const appStore = useUserStore();
 const MapShow = ref(true);
 const props = defineProps({
@@ -448,10 +449,10 @@
     let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0];
     outlet && outletRouteMethod({id:String(outlet.dataId)},false);
 
-    let lake = relationDataList.filter(i => i.dataCode == keys[2])[0];
-    let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i));
+    let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean);
+    let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i));
     features.forEach(k => (k.properties.type = undefined))
-      lake &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
+    relationIds &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
     busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true });
   }
 
@@ -817,13 +818,17 @@
   const { setLayerVisible, beansToMap } = events_params;
   const fullnessColor = (value) => {
     value = Number(value);
-    const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
+    if(!(location.href.includes('dhgx.'))) value = _.random(60,100);
+    const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
     return (colors.filter((i,idx) => idx!= colors.length-1 && i.value<value && value<colors[idx+1].value)[0] || colors[colors.length-1]).color;
   }
   const nameConcat = (item)=>{
     return (({
       lake_water_level:()=>{
         return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
+      },
+      waterlogging:()=>{
+        return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
       }
     })[item.pointType] || (()=> item.name))();
   }
@@ -852,7 +857,7 @@
     fullness:{
       method:getPipeMonitorRun,
       fields:{geometry:"pipelineGeometry",name:"name"},
-      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:4,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
+      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:8,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
     }
   };
   const other_data_params = {};
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 634846e..ac19187 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -4,7 +4,7 @@
       class="layericon"
       @click="allData.showControlBox = !allData.showControlBox"
     ></div>
-    <div class="layericon-back" @click="areaBack" v-show="isShowBack">返回</div>
+    <div class="layericon-back" @click="areaBack()" v-show="isShowBack">返回</div>
     <div class="LayerControlBox" v-show="allData.showControlBox">
       <div class="ControlBox-body">
         <el-tree
@@ -256,7 +256,7 @@
   pipeNetworkFilling:{
     title:'管网充满度(%)',
     data:[
-      { name: "0-60", color: "rgba(52,176,0,1)" },
+      { name: "0-60", color: "rgba(52,176,0,.1)" },
       { name: "60-70", color: "rgba(254,203,0,1)" },
       { name: "70-90", color: "rgba(223,1,0,1)" },
       { name: ">90", color: "rgba(142,14,11,1)" },
@@ -271,6 +271,7 @@
 });
 
 function areaBack() {
+  debugger;
   backObj.value.name == '1'?  (bus.emit("clearTemporaryData"),bus.emit(mapInitBusName),backObj.value = null) :  bus.emit("panelDataToMap", backObj.value);
 }
 
@@ -630,7 +631,7 @@
     width:12px;
     height:12px;
     margin-right: 5px;
-    
   }
+
   }
 </style>
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 83d1fbd..741e66c 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -104,6 +104,8 @@
   'plcSewagePumpStation', //plc污水泵站
   'plcRainPumpStation', //plc雨水泵站
   "plcGateStation",//plc水闸
+
+  
 ]);
 // 基本数据
 const arrid = ref([
@@ -453,7 +455,20 @@
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : '' || 1;
+   let type = properties ? properties.type : '' || 1;
+  // 针对调度辅助决策易渍水点做的判断
+  let fzjcArr=['waterlog_community_text','waterloggingPointRelation']
+    if(fzjcArr.includes(properties.type)){
+      // 调度辅助决策易渍水点上图统一类型
+      type=properties._image
+      if(!Object.keys(properties).includes('stCode')){
+      properties.stCode=properties.dataCode
+      }
+      if(!Object.keys(properties).includes('id')){
+     properties.id=properties.dataId
+      }
+    }
+ 
   let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
   console.log('1111', type, layerId);
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
index be8266a..140f6d4 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
@@ -2,7 +2,47 @@
   <!-- 监测预警  泵站工情 -->
   <div class="Bzgq flex flex-v">
     <div class="flex flex-wrap" style="gap: 10px;">
-      <div class="sumShow">
+      <div class="chunkBox flex ">
+        <div class="leftinfoCon">
+          <div class="bzzs">泵站总数({{sumObj.totalNum}})</div>
+          <div class="dqbzkb">当前泵机开泵</div>
+          <div class="rzcppl">今日总抽排排量</div>
+          <div class="cqpsw">超起排水位</div>
+        </div>
+        <div class="rightinfoCon ">
+          <div class="acrossBox acrossBox1 flex flex-justcontent-spacearound">
+            <div style="color:rgba(44, 183, 255, 1)">雨水泵站</div>
+            <div style="color:rgba(254, 103, 128, 1)">污水泵站</div>
+          </div>
+          <div class="acrossBox acrossBox2 flex flex-justcontent-spacearound">
+            <div>{{sumObj.rainPumpNum}}</div>
+            <div>{{sumObj.sewagePumpNum}}</div>
+          </div>
+          <div class="acrossBox acrossBox3 flex flex-justcontent-spacearound">
+            <div>{{sumObj.openPumpMachineNum}}/{{sumObj.pumpMachineNum}}</div>
+          </div>
+          <div class="acrossBox acrossBox4 flex flex-justcontent-spacearound">
+            <div>{{sumObj.rainOpenPumpMachineNum}}/{{sumObj.rainPumpMachineNum}}</div>
+            <div>{{sumObj.sewageOpenPumpMachineNum}}/{{sumObj.sewagePumpMachineNum}}</div>
+          </div>
+          <div class="acrossBox acrossBox5 flex flex-justcontent-spacearound">
+            <div v-if="sumObj.todayTotalCpl>=0">{{sumObj.todayTotalCpl+'万方'}}</div>
+            <div v-else>--</div>
+          </div>
+          <div class="acrossBox acrossBox6 flex flex-justcontent-spacearound">
+            <div v-if="sumObj.rainPumpTodayTotalCpl>=0">{{sumObj.rainPumpTodayTotalCpl+'万方'}}</div>
+            <div v-else>--</div>
+            <div v-if="sumObj.sewagePumpTodayTotalCpl>=0">{{sumObj.sewagePumpTodayTotalCpl+'万方'}}</div>
+            <div v-else>--</div>
+          </div>
+          <div class="acrossBox acrossBox7 flex flex-justcontent-spacearound">
+            <div>{{sumObj.cqcswNum}}</div>
+          </div>
+        </div>
+      </div>
+
+
+      <!-- <div class="sumShow">
       <div class="eachSum">
         <div class="distext flex flex-justcontent-spacebetween">
           <div class="textLeft">泵站总数</div>
@@ -89,7 +129,7 @@
         </div>
       
       </div>
-    </div>
+    </div> -->
     </div>
     
     
@@ -99,8 +139,13 @@
       <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
         <div class="topCon">
           <div class="leftCon">
-            <div class="dingweiicon" :class="item.stType=='plcRainPumpStation'?'YSBZicon':'WSBZicon'"></div>
-            <div>{{item.name}}</div>
+            <div class="dingweiicon"  :class="item.stType=='plcRainPumpStation'?'YSBZicon':'WSBZicon'"></div>
+            <div class="nameText" :title="item.name">{{item.name}}</div>
+            <div class="loadText">
+              <span>(负载：</span>
+              <span :style="{color:loadFun(item)}">{{(Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100).toFixed(0)}}%</span>
+              <span>)</span>
+            </div>
             <!-- <div class="equipmentStats onColor" v-if="item.status=='1'">在线</div>
             <div class="equipmentStats offColor" v-else>离线</div> -->
           </div>
@@ -180,6 +225,19 @@
     }
   });
 }
+// 计算负荷
+function loadFun(item){
+  // openPumpNum/pumpNumber
+     let sum = (Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100)
+if(sum<=100&&sum>75){
+  return 'rgba(254, 103, 128, 1)'
+}else if(sum<=75&&sum>=50){
+  return 'rgba(254, 227, 103, 1)'
+
+}else if(sum<50){
+return 'rgba(0, 247, 251, 1)'
+}
+}
 onMounted(() => {
   gitDataList()
   gitDataFun()
@@ -188,6 +246,75 @@
 <style lang="scss" scoped>
 .Bzgq {
      height: calc(100% - 100px);
+     .chunkBox {
+      height: 217px;
+      .leftinfoCon {
+        width: 140px;
+        height: 100%;
+        text-align: center;
+            background: url('@/assets/images/pictureOnMap/leftBZ.png') no-repeat center;
+             background-size: 100% 100%;
+             font-weight: 500;
+font-size: 16px;
+color: #FFFFFF;
+        .bzzs {
+          padding-top: 18px;
+        }
+        .dqbzkb {
+          padding-top:34px;
+
+        }
+        .rzcppl {
+          padding-top: 35px;
+
+        }
+        .cqpsw {
+          padding-top: 26px;
+
+        }
+      }
+      .rightinfoCon {
+        width: 279px;
+        border: 1px solid #4AB5FF;
+        box-sizing: border-box;
+        margin-left: 9px;
+        .acrossBox {
+          border-bottom: 1px solid #0B9BFF;
+          align-items: center;
+          font-weight: 500;
+font-size: 16px;
+color: #D2E2FF;
+        }
+        .acrossBox1 {
+          height: 31px;
+        }
+        .acrossBox2 {
+          height: 29px;
+        }
+        .acrossBox3 {
+          height: 31px;
+        }
+        .acrossBox4 {
+          height: 28px;
+        }
+        .acrossBox5 {
+          height: 31px;
+        }
+        .acrossBox6 {
+          height: 28px;
+        }
+        .acrossBox7 {
+          height: 37px;
+        }
+        .acrossBox:nth-child(odd){
+          background: linear-gradient(0deg, rgba(0,98,183,0.8) 0%, rgba(0,98,183,0.1) 100%);
+        }
+
+        .acrossBox:last-child {
+          border-bottom: 0;
+        }
+      }
+     }
   .sumShow {
     width: 206px;
     height: 75px;
@@ -274,17 +401,24 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
-            max-width: 250px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
-          }
+
           .dingweiicon {
             width: 17px;
             height: 17px;
             margin-top: 2px;
             margin-right: 5px;
+           
+          }
+           .nameText {
+               max-width: 180px;
+               overflow: hidden; //溢出隐藏
+          text-overflow: ellipsis; //超出显示省略号
+          white-space: nowrap; //强制文本在一行内显示
+            }
+          .loadText {
+            font-weight: 400;
+font-size: 14px;
+color: #CCDFFF;
           }
           .YSBZicon {
             background: url('@/assets/images/pictureOnMap/YSBZicon.png') no-repeat center;
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Szgk.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Szgk.vue
index 49c1d6c..69111d1 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Szgk.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Szgk.vue
@@ -34,7 +34,10 @@
          <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{ item.stName }}</div>
+            <div class="name" :title="item.stName">
+              <span>{{ item.stName }}</span>
+              <span v-if="item.waterLevel>=0" class="yeweiSum" >液位：{{item.waterLevel+'m'}}</span>
+            </div>
           </div>
           <div class="equipmentStats colorGreen" v-if="item.onlineStatus == 'online'">
             在线
@@ -200,12 +203,19 @@
             text-overflow: ellipsis; //超出显示省略号
             white-space: nowrap; //强制文本在一行内显示
           }
+           .yeweiSum {
+              padding-left: 10px;
+                          font-weight: 400;
+font-size: 14px;
+color: #CCDFFF;
+            }
           .dingweiicon {
             width: 25px;
             height: 28px;
             background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
               center;
             background-size: 100% 100%;
+           
           }
         }
         .equipmentStats {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue
index 0cc5d4b..58cddc8 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue
@@ -129,10 +129,10 @@
       { key: "storehouse", visible: true },
     ],
   },
-  {
-    label: "排涝总结",
-    value: "Paolaozongjie",
-  },
+  // {
+  //   label: "排涝总结",
+  //   value: "Paolaozongjie",
+  // },
 ]);
 
 const events_params = {
@@ -142,13 +142,12 @@
 };
 const TabClick = (item) => {
   const { setLayerVisible } = events_params;
+  bus.emit("clearTemporaryData");
+  bus.emit("set_area_parent",null);
+  closeAllLayer();
   newfiberMap.map.easeTo(newfiberMap.config_.params.init);
   activeSublevel.value = item.value;
-  closeAllLayer();
-  item.keys &&
-    item.keys
-      .filter((i) => i.visible)
-      .forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true }));
+  item.keys && item.keys.filter((i) => i.visible).forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true }));
 };
 
 const closeAllLayer = () => {
@@ -216,6 +215,10 @@
   return munberTimg;
   // return leftd + "天" + lefth + "时" + leftm + "分" + lefts + "秒"; //返回倒计时的字符串
 }
+const init = ()=> {
+  bus.emit("clearTemporaryData");
+  TabClick(tabArr.value.filter(i => i.value == activeSublevel.value)[0]);
+}
 
 onMounted(() => {
   getPsLevel();
@@ -223,7 +226,7 @@
     getPsLevel();
   });
 
-  const init = ()=> TabClick(tabArr.value.filter(i => i.value == activeSublevel.value)[0]);
+
   init();
   bus.on(mapInitBusName,init);
 });

diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
index 07fa179..de23f52 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png" "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
index 9afe894..af9fff2 100644
--- "a/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
+++ "b/public/static/libs/mapbox/images/\346\263\265\350\275\246\347\246\273\347\272\277.png"
Binary files differ
diff --git a/public/static/libs/mapbox/style/sprite/sprite.json b/public/static/libs/mapbox/style/sprite/sprite.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.json
+++ b/public/static/libs/mapbox/style/sprite/sprite.json
@@ -260,43 +260,45 @@
   "雨水泵站扎点@2x":{"x":28,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网水质扎点@2x":{"x":56,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
   "雨水管网液位扎点@2x":{"x":84,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x(1)":{"x":112,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@2x":{"x":140,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@2x":{"x":168,"y":290,"width":28,"height":34,"pixelRatio":1,"sdf":false},
-  "wsc1":{"x":196,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x(1)":{"x":236,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "调蓄池扎点@3x":{"x":278,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x(1)":{"x":320,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分流井扎点@3x":{"x":362,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "分区信息扎点@3x":{"x":404,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水位扎点@3x":{"x":446,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠水质扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "港渠扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河湖溢流风险口扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "河流渠道扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊水位扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "湖泊扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "接驳口扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口水质扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x(1)":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水户扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "排水护扎点@3x":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库范围i扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水库扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x(1)":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "水闸扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x(1)":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水泵站扎点@3x":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水厂扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水处理厂扎点@3x":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "污水管网水质扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨量站扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x(1)":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水泵站扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网水质扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "雨水管网液位扎点@3x":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x(1)":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水点扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
-  "渍水监测点扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
+  "wsc1":{"x":112,"y":290,"width":40,"height":40,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@2x(1)":{"x":152,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点@2x":{"x":194,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水点扎点_告警@2x":{"x":236,"y":290,"width":42,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点@2x":{"x":278,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "渍水监测点扎点_告警@2x":{"x":319,"y":290,"width":41,"height":50,"pixelRatio":1.5,"sdf":false},
+  "调蓄池扎点@3x(1)":{"x":360,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "调蓄池扎点@3x":{"x":402,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x(1)":{"x":444,"y":290,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分流井扎点@3x":{"x":0,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "分区信息扎点@3x":{"x":42,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水位扎点@3x":{"x":84,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠水质扎点@3x":{"x":126,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "港渠扎点@3x":{"x":168,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河湖溢流风险口扎点@3x":{"x":210,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "河流渠道扎点@3x":{"x":252,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊水位扎点@3x":{"x":294,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "湖泊扎点@3x":{"x":336,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "接驳口扎点@3x":{"x":378,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口水质扎点@3x":{"x":420,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x(1)":{"x":462,"y":341,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排口扎点@3x":{"x":0,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水户扎点@3x":{"x":42,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "排水护扎点@3x":{"x":84,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库范围i扎点@3x":{"x":126,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水库扎点@3x":{"x":168,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x(1)":{"x":210,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "水闸扎点@3x":{"x":252,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x(1)":{"x":294,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水泵站扎点@3x":{"x":336,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水厂扎点@3x":{"x":378,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水处理厂扎点@3x":{"x":420,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "污水管网水质扎点@3x":{"x":462,"y":392,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨量站扎点@3x":{"x":0,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x(1)":{"x":42,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水泵站扎点@3x":{"x":84,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网水质扎点@3x":{"x":126,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "雨水管网液位扎点@3x":{"x":168,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x(1)":{"x":210,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水点扎点@3x":{"x":252,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false},
+  "渍水监测点扎点@3x":{"x":294,"y":443,"width":42,"height":51,"pixelRatio":1,"sdf":false}
 }
diff --git a/public/static/libs/mapbox/style/sprite/sprite.png b/public/static/libs/mapbox/style/sprite/sprite.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite.png
+++ b/public/static/libs/mapbox/style/sprite/sprite.png
Binary files differ
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 4e53377..4d288f5 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -463,4 +463,4 @@
     method: 'get',
     params: query
   })
-}
+}
\ No newline at end of file
diff --git a/src/assets/images/pictureOnMap/leftBZ.png b/src/assets/images/pictureOnMap/leftBZ.png
new file mode 100644
index 0000000..1af9f89
--- /dev/null
+++ b/src/assets/images/pictureOnMap/leftBZ.png
Binary files differ
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index cb99f34..ecea8c4 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -41,6 +41,7 @@
 import { LineLayer, GeoJsonLayer } from "@deck.gl/layers";
 import { TripsLayer, Tile3DLayer } from "@deck.gl/geo-layers";
 import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
+const baseUrl = import.meta.env.VITE_APP_MAP_BASE_API || "";
 const appStore = useUserStore();
 const MapShow = ref(true);
 const props = defineProps({
@@ -448,10 +449,10 @@
     let outlet = relationDataList.filter(i => i.dataCode == keys[1])[0];
     outlet && outletRouteMethod({id:String(outlet.dataId)},false);
 
-    let lake = relationDataList.filter(i => i.dataCode == keys[2])[0];
-    let features = newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.id == lake.relationId && i.properties.type == keys[2]).map(i => _.cloneDeep(i));
+    let relationIds = relationDataList.filter(i => [keys[2],keys[3]].includes( i.dataCode)).map(i => i.relationId).filter(Boolean);
+    let features = newfiberMap.map.getSource("point")._data.features.filter(i => relationIds.includes(i.properties.id) && ([keys[2],keys[3]].includes(i.properties.type))).map(i => _.cloneDeep(i));
     features.forEach(k => (k.properties.type = undefined))
-      lake &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
+    relationIds &&  busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: keys[0] });
     busEmit(setLayerVisible.key, { layername: keys[0], isCheck: true });
   }
 
@@ -817,13 +818,17 @@
   const { setLayerVisible, beansToMap } = events_params;
   const fullnessColor = (value) => {
     value = Number(value);
-    const colors = [{value:0,color:"rgba(52,176,0,1)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
+    if(!(location.href.includes('dhgx.'))) value = _.random(60,100);
+    const colors = [{value:0,color:"rgba(52,176,0,0)"},{value:60,color:"rgba(254,203,0,1)"},{value:70,color:"rgba(223,1,0,1)"},{value:90,color:"rgba(142,14,11,1)"}];
     return (colors.filter((i,idx) => idx!= colors.length-1 && i.value<value && value<colors[idx+1].value)[0] || colors[colors.length-1]).color;
   }
   const nameConcat = (item)=>{
     return (({
       lake_water_level:()=>{
         return `${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
+      },
+      waterlogging:()=>{
+        return `${item.name}\n${item.siteData[0].valueName}：【${item.siteData[0].value}${item.siteData[0].unit}】`
       }
     })[item.pointType] || (()=> item.name))();
   }
@@ -852,7 +857,7 @@
     fullness:{
       method:getPipeMonitorRun,
       fields:{geometry:"pipelineGeometry",name:"name"},
-      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:4,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
+      groupMethod:(data)=> _.groupBy(data.filter(k => k.pipelineGeometry).map(o => ({...o,width:8,type:`fullness_${o.pipeSystem}`,name:`管径：${o.pipelineDiameter}\n充满度：${o.fullness}`,color:fullnessColor(o.fullness)})),(v)=>v.type)
     }
   };
   const other_data_params = {};
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 634846e..ac19187 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -4,7 +4,7 @@
       class="layericon"
       @click="allData.showControlBox = !allData.showControlBox"
     ></div>
-    <div class="layericon-back" @click="areaBack" v-show="isShowBack">返回</div>
+    <div class="layericon-back" @click="areaBack()" v-show="isShowBack">返回</div>
     <div class="LayerControlBox" v-show="allData.showControlBox">
       <div class="ControlBox-body">
         <el-tree
@@ -256,7 +256,7 @@
   pipeNetworkFilling:{
     title:'管网充满度(%)',
     data:[
-      { name: "0-60", color: "rgba(52,176,0,1)" },
+      { name: "0-60", color: "rgba(52,176,0,.1)" },
       { name: "60-70", color: "rgba(254,203,0,1)" },
       { name: "70-90", color: "rgba(223,1,0,1)" },
       { name: ">90", color: "rgba(142,14,11,1)" },
@@ -271,6 +271,7 @@
 });
 
 function areaBack() {
+  debugger;
   backObj.value.name == '1'?  (bus.emit("clearTemporaryData"),bus.emit(mapInitBusName),backObj.value = null) :  bus.emit("panelDataToMap", backObj.value);
 }
 
@@ -630,7 +631,7 @@
     width:12px;
     height:12px;
     margin-right: 5px;
-    
   }
+
   }
 </style>
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 83d1fbd..741e66c 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -104,6 +104,8 @@
   'plcSewagePumpStation', //plc污水泵站
   'plcRainPumpStation', //plc雨水泵站
   "plcGateStation",//plc水闸
+
+  
 ]);
 // 基本数据
 const arrid = ref([
@@ -453,7 +455,20 @@
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : '' || 1;
+   let type = properties ? properties.type : '' || 1;
+  // 针对调度辅助决策易渍水点做的判断
+  let fzjcArr=['waterlog_community_text','waterloggingPointRelation']
+    if(fzjcArr.includes(properties.type)){
+      // 调度辅助决策易渍水点上图统一类型
+      type=properties._image
+      if(!Object.keys(properties).includes('stCode')){
+      properties.stCode=properties.dataCode
+      }
+      if(!Object.keys(properties).includes('id')){
+     properties.id=properties.dataId
+      }
+    }
+ 
   let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
   console.log('1111', type, layerId);
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
index be8266a..140f6d4 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
@@ -2,7 +2,47 @@
   <!-- 监测预警  泵站工情 -->
   <div class="Bzgq flex flex-v">
     <div class="flex flex-wrap" style="gap: 10px;">
-      <div class="sumShow">
+      <div class="chunkBox flex ">
+        <div class="leftinfoCon">
+          <div class="bzzs">泵站总数({{sumObj.totalNum}})</div>
+          <div class="dqbzkb">当前泵机开泵</div>
+          <div class="rzcppl">今日总抽排排量</div>
+          <div class="cqpsw">超起排水位</div>
+        </div>
+        <div class="rightinfoCon ">
+          <div class="acrossBox acrossBox1 flex flex-justcontent-spacearound">
+            <div style="color:rgba(44, 183, 255, 1)">雨水泵站</div>
+            <div style="color:rgba(254, 103, 128, 1)">污水泵站</div>
+          </div>
+          <div class="acrossBox acrossBox2 flex flex-justcontent-spacearound">
+            <div>{{sumObj.rainPumpNum}}</div>
+            <div>{{sumObj.sewagePumpNum}}</div>
+          </div>
+          <div class="acrossBox acrossBox3 flex flex-justcontent-spacearound">
+            <div>{{sumObj.openPumpMachineNum}}/{{sumObj.pumpMachineNum}}</div>
+          </div>
+          <div class="acrossBox acrossBox4 flex flex-justcontent-spacearound">
+            <div>{{sumObj.rainOpenPumpMachineNum}}/{{sumObj.rainPumpMachineNum}}</div>
+            <div>{{sumObj.sewageOpenPumpMachineNum}}/{{sumObj.sewagePumpMachineNum}}</div>
+          </div>
+          <div class="acrossBox acrossBox5 flex flex-justcontent-spacearound">
+            <div v-if="sumObj.todayTotalCpl>=0">{{sumObj.todayTotalCpl+'万方'}}</div>
+            <div v-else>--</div>
+          </div>
+          <div class="acrossBox acrossBox6 flex flex-justcontent-spacearound">
+            <div v-if="sumObj.rainPumpTodayTotalCpl>=0">{{sumObj.rainPumpTodayTotalCpl+'万方'}}</div>
+            <div v-else>--</div>
+            <div v-if="sumObj.sewagePumpTodayTotalCpl>=0">{{sumObj.sewagePumpTodayTotalCpl+'万方'}}</div>
+            <div v-else>--</div>
+          </div>
+          <div class="acrossBox acrossBox7 flex flex-justcontent-spacearound">
+            <div>{{sumObj.cqcswNum}}</div>
+          </div>
+        </div>
+      </div>
+
+
+      <!-- <div class="sumShow">
       <div class="eachSum">
         <div class="distext flex flex-justcontent-spacebetween">
           <div class="textLeft">泵站总数</div>
@@ -89,7 +129,7 @@
         </div>
       
       </div>
-    </div>
+    </div> -->
     </div>
     
     
@@ -99,8 +139,13 @@
       <div class="eachData" v-for="(item) in listData" :key="item.id" @click="popUpFun(item)">
         <div class="topCon">
           <div class="leftCon">
-            <div class="dingweiicon" :class="item.stType=='plcRainPumpStation'?'YSBZicon':'WSBZicon'"></div>
-            <div>{{item.name}}</div>
+            <div class="dingweiicon"  :class="item.stType=='plcRainPumpStation'?'YSBZicon':'WSBZicon'"></div>
+            <div class="nameText" :title="item.name">{{item.name}}</div>
+            <div class="loadText">
+              <span>(负载：</span>
+              <span :style="{color:loadFun(item)}">{{(Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100).toFixed(0)}}%</span>
+              <span>)</span>
+            </div>
             <!-- <div class="equipmentStats onColor" v-if="item.status=='1'">在线</div>
             <div class="equipmentStats offColor" v-else>离线</div> -->
           </div>
@@ -180,6 +225,19 @@
     }
   });
 }
+// 计算负荷
+function loadFun(item){
+  // openPumpNum/pumpNumber
+     let sum = (Number(Number(item.openPumpNum) / Number(item.pumpNumber))*100)
+if(sum<=100&&sum>75){
+  return 'rgba(254, 103, 128, 1)'
+}else if(sum<=75&&sum>=50){
+  return 'rgba(254, 227, 103, 1)'
+
+}else if(sum<50){
+return 'rgba(0, 247, 251, 1)'
+}
+}
 onMounted(() => {
   gitDataList()
   gitDataFun()
@@ -188,6 +246,75 @@
 <style lang="scss" scoped>
 .Bzgq {
      height: calc(100% - 100px);
+     .chunkBox {
+      height: 217px;
+      .leftinfoCon {
+        width: 140px;
+        height: 100%;
+        text-align: center;
+            background: url('@/assets/images/pictureOnMap/leftBZ.png') no-repeat center;
+             background-size: 100% 100%;
+             font-weight: 500;
+font-size: 16px;
+color: #FFFFFF;
+        .bzzs {
+          padding-top: 18px;
+        }
+        .dqbzkb {
+          padding-top:34px;
+
+        }
+        .rzcppl {
+          padding-top: 35px;
+
+        }
+        .cqpsw {
+          padding-top: 26px;
+
+        }
+      }
+      .rightinfoCon {
+        width: 279px;
+        border: 1px solid #4AB5FF;
+        box-sizing: border-box;
+        margin-left: 9px;
+        .acrossBox {
+          border-bottom: 1px solid #0B9BFF;
+          align-items: center;
+          font-weight: 500;
+font-size: 16px;
+color: #D2E2FF;
+        }
+        .acrossBox1 {
+          height: 31px;
+        }
+        .acrossBox2 {
+          height: 29px;
+        }
+        .acrossBox3 {
+          height: 31px;
+        }
+        .acrossBox4 {
+          height: 28px;
+        }
+        .acrossBox5 {
+          height: 31px;
+        }
+        .acrossBox6 {
+          height: 28px;
+        }
+        .acrossBox7 {
+          height: 37px;
+        }
+        .acrossBox:nth-child(odd){
+          background: linear-gradient(0deg, rgba(0,98,183,0.8) 0%, rgba(0,98,183,0.1) 100%);
+        }
+
+        .acrossBox:last-child {
+          border-bottom: 0;
+        }
+      }
+     }
   .sumShow {
     width: 206px;
     height: 75px;
@@ -274,17 +401,24 @@
           font-weight: bold;
           font-size: 16px;
           color: #ffffff;
-          .name{
-            max-width: 250px;
-               overflow: hidden; //溢出隐藏
-          text-overflow: ellipsis; //超出显示省略号
-          white-space: nowrap; //强制文本在一行内显示
-          }
+
           .dingweiicon {
             width: 17px;
             height: 17px;
             margin-top: 2px;
             margin-right: 5px;
+           
+          }
+           .nameText {
+               max-width: 180px;
+               overflow: hidden; //溢出隐藏
+          text-overflow: ellipsis; //超出显示省略号
+          white-space: nowrap; //强制文本在一行内显示
+            }
+          .loadText {
+            font-weight: 400;
+font-size: 14px;
+color: #CCDFFF;
           }
           .YSBZicon {
             background: url('@/assets/images/pictureOnMap/YSBZicon.png') no-repeat center;
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Szgk.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Szgk.vue
index 49c1d6c..69111d1 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Szgk.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Szgk.vue
@@ -34,7 +34,10 @@
          <div class="topCon">
           <div class="leftCon">
             <div class="dingweiicon"></div>
-            <div class="name" :title="item.stName">{{ item.stName }}</div>
+            <div class="name" :title="item.stName">
+              <span>{{ item.stName }}</span>
+              <span v-if="item.waterLevel>=0" class="yeweiSum" >液位：{{item.waterLevel+'m'}}</span>
+            </div>
           </div>
           <div class="equipmentStats colorGreen" v-if="item.onlineStatus == 'online'">
             在线
@@ -200,12 +203,19 @@
             text-overflow: ellipsis; //超出显示省略号
             white-space: nowrap; //强制文本在一行内显示
           }
+           .yeweiSum {
+              padding-left: 10px;
+                          font-weight: 400;
+font-size: 14px;
+color: #CCDFFF;
+            }
           .dingweiicon {
             width: 25px;
             height: 28px;
             background: url("@/assets/images/pictureOnMap/dingweiicon.png") no-repeat
               center;
             background-size: 100% 100%;
+           
           }
         }
         .equipmentStats {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue
index 0cc5d4b..58cddc8 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue
@@ -129,10 +129,10 @@
       { key: "storehouse", visible: true },
     ],
   },
-  {
-    label: "排涝总结",
-    value: "Paolaozongjie",
-  },
+  // {
+  //   label: "排涝总结",
+  //   value: "Paolaozongjie",
+  // },
 ]);
 
 const events_params = {
@@ -142,13 +142,12 @@
 };
 const TabClick = (item) => {
   const { setLayerVisible } = events_params;
+  bus.emit("clearTemporaryData");
+  bus.emit("set_area_parent",null);
+  closeAllLayer();
   newfiberMap.map.easeTo(newfiberMap.config_.params.init);
   activeSublevel.value = item.value;
-  closeAllLayer();
-  item.keys &&
-    item.keys
-      .filter((i) => i.visible)
-      .forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true }));
+  item.keys && item.keys.filter((i) => i.visible).forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true }));
 };
 
 const closeAllLayer = () => {
@@ -216,6 +215,10 @@
   return munberTimg;
   // return leftd + "天" + lefth + "时" + leftm + "分" + lefts + "秒"; //返回倒计时的字符串
 }
+const init = ()=> {
+  bus.emit("clearTemporaryData");
+  TabClick(tabArr.value.filter(i => i.value == activeSublevel.value)[0]);
+}
 
 onMounted(() => {
   getPsLevel();
@@ -223,7 +226,7 @@
     getPsLevel();
   });
 
-  const init = ()=> TabClick(tabArr.value.filter(i => i.value == activeSublevel.value)[0]);
+
   init();
   bus.on(mapInitBusName,init);
 });
diff --git a/vite.config.js b/vite.config.js
index 60aaa88..2190341 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,10 +7,10 @@
 const Timestamp = new Date().getTime(); //随机时间戳
 // let ipLink = 'https://server1.wh-nf.cn:8201/prod-api';
 // let ipLink = 'http://192.168.16.135:9100';
-// let ipLink = 'https://dhgx.wh-nf.cn:8201/prod-api';
+let ipLink = 'https://dhgx.wh-nf.cn:8201/prod-api';
 // let ipLink = 'http://192.168.16.124:9100';
 // let ipLink = 'http://192.168.20.43:9100'; // 刘总
-let ipLink = 'http://192.168.16.43:9100';
+// let ipLink = 'http://192.168.16.43:9100';
 
 /*  */
 // https://vitejs.dev/config/