diff --git a/public/static/libs/mapbox/style/sprite/sprite@2x.json b/public/static/libs/mapbox/style/sprite/sprite@2x.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.json
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.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@2x.json b/public/static/libs/mapbox/style/sprite/sprite@2x.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.json
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.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@2x.png b/public/static/libs/mapbox/style/sprite/sprite@2x.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.png
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.png
Binary files differ

diff --git a/public/static/libs/mapbox/style/sprite/sprite@2x.json b/public/static/libs/mapbox/style/sprite/sprite@2x.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.json
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.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@2x.png b/public/static/libs/mapbox/style/sprite/sprite@2x.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.png
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.png
Binary files differ
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 9ea872f..a28127c 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -134,7 +134,24 @@
       "params": {
         "id": "高清地图",
         "url": "https://dhgx{s}.wh-nf.cn:7081/resource/tms/dhgx/{z}/{x}/{y}.png",
-        "subdomains": ["0", "1", "2", "3","4","5","6","7","8","9","10","11","12","13","14","15"],
+        "subdomains": [
+          "0",
+          "1",
+          "2",
+          "3",
+          "4",
+          "5",
+          "6",
+          "7",
+          "8",
+          "9",
+          "10",
+          "11",
+          "12",
+          "13",
+          "14",
+          "15"
+        ],
         "minZoom": 1,
         "maxZoom": 22
       },
@@ -150,6 +167,29 @@
           "params": []
         }
       ]
+    },
+    {
+      "id": "newfiber-CanvasLayer1",
+      "type": "CanvasLayer",
+      "params": {
+        "id": "newfiber-CanvasLayer",
+        "bbox": [112.00031415896964, 28.2712236676667, 116.73572001366225, 32.34584159702544],
+        "width": 626,
+        "height": 626,
+        "images": []
+      },
+      "methods": [
+        {
+          "name": "addTo",
+          "params": [
+            "''||map"
+          ]
+        },
+        {
+          "name": "show",
+          "params": []
+        }
+      ]
     }
   ],
   "l7": [

diff --git a/public/static/libs/mapbox/style/sprite/sprite@2x.json b/public/static/libs/mapbox/style/sprite/sprite@2x.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.json
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.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@2x.png b/public/static/libs/mapbox/style/sprite/sprite@2x.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.png
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.png
Binary files differ
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 9ea872f..a28127c 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -134,7 +134,24 @@
       "params": {
         "id": "高清地图",
         "url": "https://dhgx{s}.wh-nf.cn:7081/resource/tms/dhgx/{z}/{x}/{y}.png",
-        "subdomains": ["0", "1", "2", "3","4","5","6","7","8","9","10","11","12","13","14","15"],
+        "subdomains": [
+          "0",
+          "1",
+          "2",
+          "3",
+          "4",
+          "5",
+          "6",
+          "7",
+          "8",
+          "9",
+          "10",
+          "11",
+          "12",
+          "13",
+          "14",
+          "15"
+        ],
         "minZoom": 1,
         "maxZoom": 22
       },
@@ -150,6 +167,29 @@
           "params": []
         }
       ]
+    },
+    {
+      "id": "newfiber-CanvasLayer1",
+      "type": "CanvasLayer",
+      "params": {
+        "id": "newfiber-CanvasLayer",
+        "bbox": [112.00031415896964, 28.2712236676667, 116.73572001366225, 32.34584159702544],
+        "width": 626,
+        "height": 626,
+        "images": []
+      },
+      "methods": [
+        {
+          "name": "addTo",
+          "params": [
+            "''||map"
+          ]
+        },
+        {
+          "name": "show",
+          "params": []
+        }
+      ]
     }
   ],
   "l7": [
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index d56e9f3..9214976 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -69,16 +69,16 @@
           (sprites || []).forEach((url) =>
                   map.style._loadSprite(
                           url.includes("http")
-                                  ? baseUrl + url
-                                  : window.location.origin.split("#")[0] + url
+                                  ?  url
+                                  : window.location.origin.split("#")[0]  + baseUrl + url
                   )
           );
           ((l7 || []).images || []).forEach((item) =>
                   newfiberMap.addImage(
                           item.name,
                           item.url.includes("http")
-                                  ? baseUrl + item.url
-                                  : window.location.origin.split("#")[0] + item.url
+                                  ?  item.url
+                                  : window.location.origin.split("#")[0] +baseUrl + item.url
                   )
           );
           ((mapbox || []).images || []).forEach((item) =>
@@ -87,7 +87,7 @@
                           : newfiberMap.map.loadImage(
                           item.url.includes("http")
                                   ?  item.url
-                                  : baseUrl + item.url,
+                                  :  window.location.origin.split("#")[0] + baseUrl + item.url,
                           (error, image) => newfiberMap.map.addImage(item.name, image)
                           )
           );

diff --git a/public/static/libs/mapbox/style/sprite/sprite@2x.json b/public/static/libs/mapbox/style/sprite/sprite@2x.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.json
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.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@2x.png b/public/static/libs/mapbox/style/sprite/sprite@2x.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.png
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.png
Binary files differ
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 9ea872f..a28127c 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -134,7 +134,24 @@
       "params": {
         "id": "高清地图",
         "url": "https://dhgx{s}.wh-nf.cn:7081/resource/tms/dhgx/{z}/{x}/{y}.png",
-        "subdomains": ["0", "1", "2", "3","4","5","6","7","8","9","10","11","12","13","14","15"],
+        "subdomains": [
+          "0",
+          "1",
+          "2",
+          "3",
+          "4",
+          "5",
+          "6",
+          "7",
+          "8",
+          "9",
+          "10",
+          "11",
+          "12",
+          "13",
+          "14",
+          "15"
+        ],
         "minZoom": 1,
         "maxZoom": 22
       },
@@ -150,6 +167,29 @@
           "params": []
         }
       ]
+    },
+    {
+      "id": "newfiber-CanvasLayer1",
+      "type": "CanvasLayer",
+      "params": {
+        "id": "newfiber-CanvasLayer",
+        "bbox": [112.00031415896964, 28.2712236676667, 116.73572001366225, 32.34584159702544],
+        "width": 626,
+        "height": 626,
+        "images": []
+      },
+      "methods": [
+        {
+          "name": "addTo",
+          "params": [
+            "''||map"
+          ]
+        },
+        {
+          "name": "show",
+          "params": []
+        }
+      ]
     }
   ],
   "l7": [
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index d56e9f3..9214976 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -69,16 +69,16 @@
           (sprites || []).forEach((url) =>
                   map.style._loadSprite(
                           url.includes("http")
-                                  ? baseUrl + url
-                                  : window.location.origin.split("#")[0] + url
+                                  ?  url
+                                  : window.location.origin.split("#")[0]  + baseUrl + url
                   )
           );
           ((l7 || []).images || []).forEach((item) =>
                   newfiberMap.addImage(
                           item.name,
                           item.url.includes("http")
-                                  ? baseUrl + item.url
-                                  : window.location.origin.split("#")[0] + item.url
+                                  ?  item.url
+                                  : window.location.origin.split("#")[0] +baseUrl + item.url
                   )
           );
           ((mapbox || []).images || []).forEach((item) =>
@@ -87,7 +87,7 @@
                           : newfiberMap.map.loadImage(
                           item.url.includes("http")
                                   ?  item.url
-                                  : baseUrl + item.url,
+                                  :  window.location.origin.split("#")[0] + baseUrl + item.url,
                           (error, image) => newfiberMap.map.addImage(item.name, image)
                           )
           );
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index ecea8c4..801909b 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -669,7 +669,7 @@
             .setData(geojson);*/
 }
 
-const getModalData = () => {
+const getModalData = async () => {
 
   isClockInRange();
   Object.keys(events_params)
@@ -722,6 +722,12 @@
   newfiberMap.contextMenu.addTo(newfiberMap.map);
   // cadToMap();
   bus.emit(mapInitBusName);
+
+  let results = await request("/weather/new_radar/json/az9270.json?_=" + Date.now());
+  let data = eval(_.split(_.split(results,'(')[1],')')[0]);
+  let imgs = data.map((i) => `/weather/new_radar/l/${i.name}`);
+  newfiberMap.rainsLayer = newfiberMap.map.ogcLayers.filter((i) => i.newfiberId == "newfiber-CanvasLayer1")[0];
+  newfiberMap.rainsLayer.setInitializeParams({ images: imgs });
 };
 
 const ysFlow = (geojson) => {

diff --git a/public/static/libs/mapbox/style/sprite/sprite@2x.json b/public/static/libs/mapbox/style/sprite/sprite@2x.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.json
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.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@2x.png b/public/static/libs/mapbox/style/sprite/sprite@2x.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.png
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.png
Binary files differ
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 9ea872f..a28127c 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -134,7 +134,24 @@
       "params": {
         "id": "高清地图",
         "url": "https://dhgx{s}.wh-nf.cn:7081/resource/tms/dhgx/{z}/{x}/{y}.png",
-        "subdomains": ["0", "1", "2", "3","4","5","6","7","8","9","10","11","12","13","14","15"],
+        "subdomains": [
+          "0",
+          "1",
+          "2",
+          "3",
+          "4",
+          "5",
+          "6",
+          "7",
+          "8",
+          "9",
+          "10",
+          "11",
+          "12",
+          "13",
+          "14",
+          "15"
+        ],
         "minZoom": 1,
         "maxZoom": 22
       },
@@ -150,6 +167,29 @@
           "params": []
         }
       ]
+    },
+    {
+      "id": "newfiber-CanvasLayer1",
+      "type": "CanvasLayer",
+      "params": {
+        "id": "newfiber-CanvasLayer",
+        "bbox": [112.00031415896964, 28.2712236676667, 116.73572001366225, 32.34584159702544],
+        "width": 626,
+        "height": 626,
+        "images": []
+      },
+      "methods": [
+        {
+          "name": "addTo",
+          "params": [
+            "''||map"
+          ]
+        },
+        {
+          "name": "show",
+          "params": []
+        }
+      ]
     }
   ],
   "l7": [
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index d56e9f3..9214976 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -69,16 +69,16 @@
           (sprites || []).forEach((url) =>
                   map.style._loadSprite(
                           url.includes("http")
-                                  ? baseUrl + url
-                                  : window.location.origin.split("#")[0] + url
+                                  ?  url
+                                  : window.location.origin.split("#")[0]  + baseUrl + url
                   )
           );
           ((l7 || []).images || []).forEach((item) =>
                   newfiberMap.addImage(
                           item.name,
                           item.url.includes("http")
-                                  ? baseUrl + item.url
-                                  : window.location.origin.split("#")[0] + item.url
+                                  ?  item.url
+                                  : window.location.origin.split("#")[0] +baseUrl + item.url
                   )
           );
           ((mapbox || []).images || []).forEach((item) =>
@@ -87,7 +87,7 @@
                           : newfiberMap.map.loadImage(
                           item.url.includes("http")
                                   ?  item.url
-                                  : baseUrl + item.url,
+                                  :  window.location.origin.split("#")[0] + baseUrl + item.url,
                           (error, image) => newfiberMap.map.addImage(item.name, image)
                           )
           );
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index ecea8c4..801909b 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -669,7 +669,7 @@
             .setData(geojson);*/
 }
 
-const getModalData = () => {
+const getModalData = async () => {
 
   isClockInRange();
   Object.keys(events_params)
@@ -722,6 +722,12 @@
   newfiberMap.contextMenu.addTo(newfiberMap.map);
   // cadToMap();
   bus.emit(mapInitBusName);
+
+  let results = await request("/weather/new_radar/json/az9270.json?_=" + Date.now());
+  let data = eval(_.split(_.split(results,'(')[1],')')[0]);
+  let imgs = data.map((i) => `/weather/new_radar/l/${i.name}`);
+  newfiberMap.rainsLayer = newfiberMap.map.ogcLayers.filter((i) => i.newfiberId == "newfiber-CanvasLayer1")[0];
+  newfiberMap.rainsLayer.setInitializeParams({ images: imgs });
 };
 
 const ysFlow = (geojson) => {
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 736c92f..86a1b8d 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -155,3 +155,20 @@
   }
 }
 </style>
+POINT(114.595506723000085,30.5468164890000367)
+POINT(114.6115546520000521,30.5201380616283231)
+POINT(114.5891051925000284,30.4902713410000672)
+POINT(114.5956185080000296,30.4731438210000363)
+
+
+
+
+
+
+
+
+
+
+
+
+

diff --git a/public/static/libs/mapbox/style/sprite/sprite@2x.json b/public/static/libs/mapbox/style/sprite/sprite@2x.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.json
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.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@2x.png b/public/static/libs/mapbox/style/sprite/sprite@2x.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.png
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.png
Binary files differ
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 9ea872f..a28127c 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -134,7 +134,24 @@
       "params": {
         "id": "高清地图",
         "url": "https://dhgx{s}.wh-nf.cn:7081/resource/tms/dhgx/{z}/{x}/{y}.png",
-        "subdomains": ["0", "1", "2", "3","4","5","6","7","8","9","10","11","12","13","14","15"],
+        "subdomains": [
+          "0",
+          "1",
+          "2",
+          "3",
+          "4",
+          "5",
+          "6",
+          "7",
+          "8",
+          "9",
+          "10",
+          "11",
+          "12",
+          "13",
+          "14",
+          "15"
+        ],
         "minZoom": 1,
         "maxZoom": 22
       },
@@ -150,6 +167,29 @@
           "params": []
         }
       ]
+    },
+    {
+      "id": "newfiber-CanvasLayer1",
+      "type": "CanvasLayer",
+      "params": {
+        "id": "newfiber-CanvasLayer",
+        "bbox": [112.00031415896964, 28.2712236676667, 116.73572001366225, 32.34584159702544],
+        "width": 626,
+        "height": 626,
+        "images": []
+      },
+      "methods": [
+        {
+          "name": "addTo",
+          "params": [
+            "''||map"
+          ]
+        },
+        {
+          "name": "show",
+          "params": []
+        }
+      ]
     }
   ],
   "l7": [
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index d56e9f3..9214976 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -69,16 +69,16 @@
           (sprites || []).forEach((url) =>
                   map.style._loadSprite(
                           url.includes("http")
-                                  ? baseUrl + url
-                                  : window.location.origin.split("#")[0] + url
+                                  ?  url
+                                  : window.location.origin.split("#")[0]  + baseUrl + url
                   )
           );
           ((l7 || []).images || []).forEach((item) =>
                   newfiberMap.addImage(
                           item.name,
                           item.url.includes("http")
-                                  ? baseUrl + item.url
-                                  : window.location.origin.split("#")[0] + item.url
+                                  ?  item.url
+                                  : window.location.origin.split("#")[0] +baseUrl + item.url
                   )
           );
           ((mapbox || []).images || []).forEach((item) =>
@@ -87,7 +87,7 @@
                           : newfiberMap.map.loadImage(
                           item.url.includes("http")
                                   ?  item.url
-                                  : baseUrl + item.url,
+                                  :  window.location.origin.split("#")[0] + baseUrl + item.url,
                           (error, image) => newfiberMap.map.addImage(item.name, image)
                           )
           );
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index ecea8c4..801909b 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -669,7 +669,7 @@
             .setData(geojson);*/
 }
 
-const getModalData = () => {
+const getModalData = async () => {
 
   isClockInRange();
   Object.keys(events_params)
@@ -722,6 +722,12 @@
   newfiberMap.contextMenu.addTo(newfiberMap.map);
   // cadToMap();
   bus.emit(mapInitBusName);
+
+  let results = await request("/weather/new_radar/json/az9270.json?_=" + Date.now());
+  let data = eval(_.split(_.split(results,'(')[1],')')[0]);
+  let imgs = data.map((i) => `/weather/new_radar/l/${i.name}`);
+  newfiberMap.rainsLayer = newfiberMap.map.ogcLayers.filter((i) => i.newfiberId == "newfiber-CanvasLayer1")[0];
+  newfiberMap.rainsLayer.setInitializeParams({ images: imgs });
 };
 
 const ysFlow = (geojson) => {
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 736c92f..86a1b8d 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -155,3 +155,20 @@
   }
 }
 </style>
+POINT(114.595506723000085,30.5468164890000367)
+POINT(114.6115546520000521,30.5201380616283231)
+POINT(114.5891051925000284,30.4902713410000672)
+POINT(114.5956185080000296,30.4731438210000363)
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue
index d5ff902..836256c 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue
@@ -3,7 +3,10 @@
   <div class="RainfallForecast">
     <EachModuleTitle
       title="降雨预报"
-      :isTab="false"
+      :rightTabArr="rightTabArr"
+      :activeTab="activeTab"
+      :isTab="true"
+      @rightTabClick="rightTabClick"
     ></EachModuleTitle>
 
     <div class="echartJYYB" v-loading="loading"
@@ -27,14 +30,24 @@
   </div>
 </template>
 <script setup nama="RainfallForecast">
-import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted,onBeforeUnmount } from 'vue';
 import EachModuleTitle from '@/views/pictureOnMap/page/components/EachModuleTitle.vue';
 import * as reviewApi from "@/api/FloodControlAndDrainage.js";
 
 import BarChart from './BarChart.vue';
 
 const { proxy } = getCurrentInstance();
-
+const activeTab = ref('');
+const rightTabArr = ref([
+  {
+    label: '开始',
+    value: '0',
+  },
+  {
+    label: '暂停',
+    value: '1',
+  },
+]);
 // 获取数据
 const loading=ref(false)
 let allData = reactive({
@@ -79,9 +92,25 @@
     loading.value=false
   });
 }
+function rightTabClick(item){
+  ({
+    "0":()=>{
+      newfiberMap.rainsLayer.show();
+      newfiberMap.rainsInterval = setInterval(()=> newfiberMap.rainsLayer.next(1),1000)
+    },
+    "1":()=>{
+      newfiberMap.rainsInterval && clearInterval(newfiberMap.rainsInterval);
+      newfiberMap.rainsInterval = null;
+    },
+  }[item.value])();
+}
 onMounted(() => {
   gitDataFun()
 });
+onBeforeUnmount(()=>{
+  newfiberMap.rainsInterval && clearInterval(newfiberMap.rainsInterval);
+  newfiberMap.rainsLayer.hide();
+})
 </script>
 <style lang="scss" scoped>
 .RainfallForecast {

diff --git a/public/static/libs/mapbox/style/sprite/sprite@2x.json b/public/static/libs/mapbox/style/sprite/sprite@2x.json
index 904214a..0344d4c 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.json
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.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@2x.png b/public/static/libs/mapbox/style/sprite/sprite@2x.png
index 9d57b55..c840764 100644
--- a/public/static/libs/mapbox/style/sprite/sprite@2x.png
+++ b/public/static/libs/mapbox/style/sprite/sprite@2x.png
Binary files differ
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 9ea872f..a28127c 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -134,7 +134,24 @@
       "params": {
         "id": "高清地图",
         "url": "https://dhgx{s}.wh-nf.cn:7081/resource/tms/dhgx/{z}/{x}/{y}.png",
-        "subdomains": ["0", "1", "2", "3","4","5","6","7","8","9","10","11","12","13","14","15"],
+        "subdomains": [
+          "0",
+          "1",
+          "2",
+          "3",
+          "4",
+          "5",
+          "6",
+          "7",
+          "8",
+          "9",
+          "10",
+          "11",
+          "12",
+          "13",
+          "14",
+          "15"
+        ],
         "minZoom": 1,
         "maxZoom": 22
       },
@@ -150,6 +167,29 @@
           "params": []
         }
       ]
+    },
+    {
+      "id": "newfiber-CanvasLayer1",
+      "type": "CanvasLayer",
+      "params": {
+        "id": "newfiber-CanvasLayer",
+        "bbox": [112.00031415896964, 28.2712236676667, 116.73572001366225, 32.34584159702544],
+        "width": 626,
+        "height": 626,
+        "images": []
+      },
+      "methods": [
+        {
+          "name": "addTo",
+          "params": [
+            "''||map"
+          ]
+        },
+        {
+          "name": "show",
+          "params": []
+        }
+      ]
     }
   ],
   "l7": [
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index d56e9f3..9214976 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -69,16 +69,16 @@
           (sprites || []).forEach((url) =>
                   map.style._loadSprite(
                           url.includes("http")
-                                  ? baseUrl + url
-                                  : window.location.origin.split("#")[0] + url
+                                  ?  url
+                                  : window.location.origin.split("#")[0]  + baseUrl + url
                   )
           );
           ((l7 || []).images || []).forEach((item) =>
                   newfiberMap.addImage(
                           item.name,
                           item.url.includes("http")
-                                  ? baseUrl + item.url
-                                  : window.location.origin.split("#")[0] + item.url
+                                  ?  item.url
+                                  : window.location.origin.split("#")[0] +baseUrl + item.url
                   )
           );
           ((mapbox || []).images || []).forEach((item) =>
@@ -87,7 +87,7 @@
                           : newfiberMap.map.loadImage(
                           item.url.includes("http")
                                   ?  item.url
-                                  : baseUrl + item.url,
+                                  :  window.location.origin.split("#")[0] + baseUrl + item.url,
                           (error, image) => newfiberMap.map.addImage(item.name, image)
                           )
           );
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index ecea8c4..801909b 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -669,7 +669,7 @@
             .setData(geojson);*/
 }
 
-const getModalData = () => {
+const getModalData = async () => {
 
   isClockInRange();
   Object.keys(events_params)
@@ -722,6 +722,12 @@
   newfiberMap.contextMenu.addTo(newfiberMap.map);
   // cadToMap();
   bus.emit(mapInitBusName);
+
+  let results = await request("/weather/new_radar/json/az9270.json?_=" + Date.now());
+  let data = eval(_.split(_.split(results,'(')[1],')')[0]);
+  let imgs = data.map((i) => `/weather/new_radar/l/${i.name}`);
+  newfiberMap.rainsLayer = newfiberMap.map.ogcLayers.filter((i) => i.newfiberId == "newfiber-CanvasLayer1")[0];
+  newfiberMap.rainsLayer.setInitializeParams({ images: imgs });
 };
 
 const ysFlow = (geojson) => {
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 736c92f..86a1b8d 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -155,3 +155,20 @@
   }
 }
 </style>
+POINT(114.595506723000085,30.5468164890000367)
+POINT(114.6115546520000521,30.5201380616283231)
+POINT(114.5891051925000284,30.4902713410000672)
+POINT(114.5956185080000296,30.4731438210000363)
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue
index d5ff902..836256c 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue
@@ -3,7 +3,10 @@
   <div class="RainfallForecast">
     <EachModuleTitle
       title="降雨预报"
-      :isTab="false"
+      :rightTabArr="rightTabArr"
+      :activeTab="activeTab"
+      :isTab="true"
+      @rightTabClick="rightTabClick"
     ></EachModuleTitle>
 
     <div class="echartJYYB" v-loading="loading"
@@ -27,14 +30,24 @@
   </div>
 </template>
 <script setup nama="RainfallForecast">
-import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted,onBeforeUnmount } from 'vue';
 import EachModuleTitle from '@/views/pictureOnMap/page/components/EachModuleTitle.vue';
 import * as reviewApi from "@/api/FloodControlAndDrainage.js";
 
 import BarChart from './BarChart.vue';
 
 const { proxy } = getCurrentInstance();
-
+const activeTab = ref('');
+const rightTabArr = ref([
+  {
+    label: '开始',
+    value: '0',
+  },
+  {
+    label: '暂停',
+    value: '1',
+  },
+]);
 // 获取数据
 const loading=ref(false)
 let allData = reactive({
@@ -79,9 +92,25 @@
     loading.value=false
   });
 }
+function rightTabClick(item){
+  ({
+    "0":()=>{
+      newfiberMap.rainsLayer.show();
+      newfiberMap.rainsInterval = setInterval(()=> newfiberMap.rainsLayer.next(1),1000)
+    },
+    "1":()=>{
+      newfiberMap.rainsInterval && clearInterval(newfiberMap.rainsInterval);
+      newfiberMap.rainsInterval = null;
+    },
+  }[item.value])();
+}
 onMounted(() => {
   gitDataFun()
 });
+onBeforeUnmount(()=>{
+  newfiberMap.rainsInterval && clearInterval(newfiberMap.rainsInterval);
+  newfiberMap.rainsLayer.hide();
+})
 </script>
 <style lang="scss" scoped>
 .RainfallForecast {
diff --git a/vite.config.js b/vite.config.js
index 2190341..c610685 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -81,6 +81,17 @@
           logLevel: 'debug',
           rewrite: p => p.replace('/prod-api/bdApi', ''),
         },
+        // 使用 proxy 实例
+        "/prod-api/weather": {
+          target: "https://img.weather.com.cn",
+          changeOrigin: true,
+          rewrite: (path) => path.replace("/prod-api/weather", ""),
+        },
+        "/weather": {
+        target: "https://img.weather.com.cn",
+        changeOrigin: true,
+        rewrite: (path) => path.replace("/weather", ""),
+      },
         '/prod-api': {
           target: ipLink,
           changeOrigin: true,