diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
new file mode 100644
index 0000000..9761caa
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
Binary files differ

diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
new file mode 100644
index 0000000..9761caa
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
new file mode 100644
index 0000000..06a6fb7
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
Binary files differ

diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
new file mode 100644
index 0000000..9761caa
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
new file mode 100644
index 0000000..06a6fb7
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..3c8715e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
Binary files differ

diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
new file mode 100644
index 0000000..9761caa
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
new file mode 100644
index 0000000..06a6fb7
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..3c8715e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
new file mode 100644
index 0000000..20173dd
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
Binary files differ

diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
new file mode 100644
index 0000000..9761caa
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
new file mode 100644
index 0000000..06a6fb7
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..3c8715e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
new file mode 100644
index 0000000..20173dd
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png"
new file mode 100644
index 0000000..b4ed63e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png"
Binary files differ

diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
new file mode 100644
index 0000000..9761caa
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
new file mode 100644
index 0000000..06a6fb7
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..3c8715e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
new file mode 100644
index 0000000..20173dd
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png"
new file mode 100644
index 0000000..b4ed63e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..34be04e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.png"
Binary files differ

diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
new file mode 100644
index 0000000..9761caa
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
new file mode 100644
index 0000000..06a6fb7
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..3c8715e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
new file mode 100644
index 0000000..20173dd
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png"
new file mode 100644
index 0000000..b4ed63e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..34be04e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.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 5631f4f..82cd64e 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -19,7 +19,7 @@
       "https://supermap14.wh-nf.cn:8090/vt/mvt",
       "https://supermap15.wh-nf.cn:8090/vt/mvt"
     ],
-    "geojson": "https://supermap13.wh-nf.cn:8090/vt/geojson",
+    "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson",
     "sprites": [
       "/static/libs/mapbox/style/sprite/sprite"
     ],
@@ -51,18 +51,9 @@
     },
     "mapbox": {
       "images": [
-        {
-          "name": "水库水位@2x",
-          "url": "/static/libs/mapbox/images/水库水位@2x.png"
-        },
-        {
-          "name": "污水处理站",
-          "url": "/static/libs/mapbox/images/污水处理站.png"
-        },
-        {
-          "name": "堤防备料@2x",
-          "url": "/static/libs/mapbox/images/堤防备料@2x.png"
-        },
+        {"name": "水库水位@2x", "url": "/static/libs/mapbox/images/水库水位@2x.png"},
+        {"name": "污水处理站", "url": "/static/libs/mapbox/images/污水处理站.png"},
+        {"name": "堤防备料@2x", "url": "/static/libs/mapbox/images/堤防备料@2x.png"},
         {"name": "物资仓库@2x", "url": "/static/libs/mapbox/images/物资仓库@2x.png"},
         {"name": "blockage", "url": "/static/libs/mapbox/images/blockage.png"},
         {"name": "full", "url": "/static/libs/mapbox/images/full.png"},
@@ -73,6 +64,14 @@
         {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"},
         {"name": "污水厂", "url": "/static/libs/mapbox/images/污水厂.png"},
         {"name": "污水监测", "url": "/static/libs/mapbox/images/污水监测.png"},
+
+        {"name": "水质异常", "url": "/static/libs/mapbox/images/污水-水质异常.png"},
+        {"name": "淤堵风险", "url": "/static/libs/mapbox/images/污水-淤堵风险.png"},
+        {"name": "雨水混入", "url": "/static/libs/mapbox/images/污水-雨水混入.png"},
+        {"name": "地下水注入", "url": "/static/libs/mapbox/images/雨水-地下水注入.png"},
+        {"name": "晴天出流", "url": "/static/libs/mapbox/images/雨水-晴天出流.png"},
+        {"name": "污水混入", "url": "/static/libs/mapbox/images/雨水-污水混入.png"},
+
         {"name": "泵车在线", "url": "/static/libs/mapbox/images/泵车在线.png", "width": 15,"height": 20},
         {"name": "泵车离线", "url": "/static/libs/mapbox/images/泵车离线.png", "width": 15,"height": 20},
         {"name": "heigh", "url": "/static/libs/mapbox/images/full_out.gif", "width": 50,"height": 50}
@@ -1167,7 +1166,7 @@
       "layout": {
         "icon-image": [
             "match",
-          ["get", "type"],
+          ["get", "_image"],
             "rain","雨量站扎点@2x",
             "waterlog_point","排渍调度",
             "port_channel_info","港渠扎点@2x",
@@ -1218,7 +1217,21 @@
             "waterlog_community", "渍水点扎点@2x",
             "clickPoint", "selectedLocation",
             "temporary", "selectedLocation",
-            "tran"
+
+          "QTCL","晴天出流",
+          "WSHR","污水混入",
+          "DXSZR","地下水注入",
+
+          "GJMY","地下水注入",
+          "GWMG","地下水注入",
+          "GWGSWYX","地下水注入",
+          "GJMYFX","地下水注入",
+
+          "YSHR","雨水混入",
+          "YDFX","淤堵风险",
+          "SZYC","水质异常",
+
+          "tran"
         ],
         "icon-allow-overlap": false,
         "icon-anchor": "center",
@@ -1445,7 +1458,7 @@
         "text-line-height": 3,
         "text-anchor": "top"
       },
-      "minzoom": 14,
+      "minzoom": 15.5,
       "maxzoom": 24,
       "mType": "geojsonMvt",
       "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry"
@@ -1458,7 +1471,8 @@
         "all",
         ["in", ["get", "管段类型"],["literal", [""]]]
       ],
-      "minzoom": 14,
+      "minzoom": 15.6,
+      "maxzoom": 24,
       "layout": {
         "symbol-placement": "line-center",
         "symbol-spacing": 40,
@@ -1648,5 +1662,3 @@
     "五加湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}
   }
 }
-
-

diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
new file mode 100644
index 0000000..9761caa
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
new file mode 100644
index 0000000..06a6fb7
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..3c8715e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
new file mode 100644
index 0000000..20173dd
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png"
new file mode 100644
index 0000000..b4ed63e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..34be04e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.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 5631f4f..82cd64e 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -19,7 +19,7 @@
       "https://supermap14.wh-nf.cn:8090/vt/mvt",
       "https://supermap15.wh-nf.cn:8090/vt/mvt"
     ],
-    "geojson": "https://supermap13.wh-nf.cn:8090/vt/geojson",
+    "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson",
     "sprites": [
       "/static/libs/mapbox/style/sprite/sprite"
     ],
@@ -51,18 +51,9 @@
     },
     "mapbox": {
       "images": [
-        {
-          "name": "水库水位@2x",
-          "url": "/static/libs/mapbox/images/水库水位@2x.png"
-        },
-        {
-          "name": "污水处理站",
-          "url": "/static/libs/mapbox/images/污水处理站.png"
-        },
-        {
-          "name": "堤防备料@2x",
-          "url": "/static/libs/mapbox/images/堤防备料@2x.png"
-        },
+        {"name": "水库水位@2x", "url": "/static/libs/mapbox/images/水库水位@2x.png"},
+        {"name": "污水处理站", "url": "/static/libs/mapbox/images/污水处理站.png"},
+        {"name": "堤防备料@2x", "url": "/static/libs/mapbox/images/堤防备料@2x.png"},
         {"name": "物资仓库@2x", "url": "/static/libs/mapbox/images/物资仓库@2x.png"},
         {"name": "blockage", "url": "/static/libs/mapbox/images/blockage.png"},
         {"name": "full", "url": "/static/libs/mapbox/images/full.png"},
@@ -73,6 +64,14 @@
         {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"},
         {"name": "污水厂", "url": "/static/libs/mapbox/images/污水厂.png"},
         {"name": "污水监测", "url": "/static/libs/mapbox/images/污水监测.png"},
+
+        {"name": "水质异常", "url": "/static/libs/mapbox/images/污水-水质异常.png"},
+        {"name": "淤堵风险", "url": "/static/libs/mapbox/images/污水-淤堵风险.png"},
+        {"name": "雨水混入", "url": "/static/libs/mapbox/images/污水-雨水混入.png"},
+        {"name": "地下水注入", "url": "/static/libs/mapbox/images/雨水-地下水注入.png"},
+        {"name": "晴天出流", "url": "/static/libs/mapbox/images/雨水-晴天出流.png"},
+        {"name": "污水混入", "url": "/static/libs/mapbox/images/雨水-污水混入.png"},
+
         {"name": "泵车在线", "url": "/static/libs/mapbox/images/泵车在线.png", "width": 15,"height": 20},
         {"name": "泵车离线", "url": "/static/libs/mapbox/images/泵车离线.png", "width": 15,"height": 20},
         {"name": "heigh", "url": "/static/libs/mapbox/images/full_out.gif", "width": 50,"height": 50}
@@ -1167,7 +1166,7 @@
       "layout": {
         "icon-image": [
             "match",
-          ["get", "type"],
+          ["get", "_image"],
             "rain","雨量站扎点@2x",
             "waterlog_point","排渍调度",
             "port_channel_info","港渠扎点@2x",
@@ -1218,7 +1217,21 @@
             "waterlog_community", "渍水点扎点@2x",
             "clickPoint", "selectedLocation",
             "temporary", "selectedLocation",
-            "tran"
+
+          "QTCL","晴天出流",
+          "WSHR","污水混入",
+          "DXSZR","地下水注入",
+
+          "GJMY","地下水注入",
+          "GWMG","地下水注入",
+          "GWGSWYX","地下水注入",
+          "GJMYFX","地下水注入",
+
+          "YSHR","雨水混入",
+          "YDFX","淤堵风险",
+          "SZYC","水质异常",
+
+          "tran"
         ],
         "icon-allow-overlap": false,
         "icon-anchor": "center",
@@ -1445,7 +1458,7 @@
         "text-line-height": 3,
         "text-anchor": "top"
       },
-      "minzoom": 14,
+      "minzoom": 15.5,
       "maxzoom": 24,
       "mType": "geojsonMvt",
       "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry"
@@ -1458,7 +1471,8 @@
         "all",
         ["in", ["get", "管段类型"],["literal", [""]]]
       ],
-      "minzoom": 14,
+      "minzoom": 15.6,
+      "maxzoom": 24,
       "layout": {
         "symbol-placement": "line-center",
         "symbol-spacing": 40,
@@ -1648,5 +1662,3 @@
     "五加湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}
   }
 }
-
-
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index 0704f07..2a6d65b 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -500,18 +500,9 @@
           (a.properties.minzoom = a.properties.minzoom || 0),
             (a.properties.color = a.properties.color || "rgba(0,0,0,1)"),
             (a.properties.type = a.properties.type || i.layername);
-          a.properties.name =
-            a.properties.name ||
-            a.properties.Name ||
-            a.properties.stName ||
-            a.properties.pointNumber ||
-            a.properties.sewageName ||
-            a.properties.sectionName ||
-            a.properties.pumpName;
-          if (
-            a.properties.name &&
-            !turf.getType(a).toLocaleLowerCase().includes("point")
-          ) {
+          a.properties.name = a.properties.name || a.properties.Name || a.properties.stName || a.properties.pointNumber || a.properties.sewageName || a.properties.sectionName || a.properties.pumpName;
+          a.properties._image = a.properties._image || a.properties.type;
+          if (a.properties.name && !turf.getType(a).toLocaleLowerCase().includes("point")) {
             let center = turf.center(a);
             center.properties = { ...a.properties, minzoom: 10,type:a.properties.type +"_text" };
             center.properties.geometry = Terraformer.WKT.convert(center.geometry);

diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
new file mode 100644
index 0000000..9761caa
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
new file mode 100644
index 0000000..06a6fb7
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..3c8715e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
new file mode 100644
index 0000000..20173dd
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png"
new file mode 100644
index 0000000..b4ed63e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..34be04e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.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 5631f4f..82cd64e 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -19,7 +19,7 @@
       "https://supermap14.wh-nf.cn:8090/vt/mvt",
       "https://supermap15.wh-nf.cn:8090/vt/mvt"
     ],
-    "geojson": "https://supermap13.wh-nf.cn:8090/vt/geojson",
+    "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson",
     "sprites": [
       "/static/libs/mapbox/style/sprite/sprite"
     ],
@@ -51,18 +51,9 @@
     },
     "mapbox": {
       "images": [
-        {
-          "name": "水库水位@2x",
-          "url": "/static/libs/mapbox/images/水库水位@2x.png"
-        },
-        {
-          "name": "污水处理站",
-          "url": "/static/libs/mapbox/images/污水处理站.png"
-        },
-        {
-          "name": "堤防备料@2x",
-          "url": "/static/libs/mapbox/images/堤防备料@2x.png"
-        },
+        {"name": "水库水位@2x", "url": "/static/libs/mapbox/images/水库水位@2x.png"},
+        {"name": "污水处理站", "url": "/static/libs/mapbox/images/污水处理站.png"},
+        {"name": "堤防备料@2x", "url": "/static/libs/mapbox/images/堤防备料@2x.png"},
         {"name": "物资仓库@2x", "url": "/static/libs/mapbox/images/物资仓库@2x.png"},
         {"name": "blockage", "url": "/static/libs/mapbox/images/blockage.png"},
         {"name": "full", "url": "/static/libs/mapbox/images/full.png"},
@@ -73,6 +64,14 @@
         {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"},
         {"name": "污水厂", "url": "/static/libs/mapbox/images/污水厂.png"},
         {"name": "污水监测", "url": "/static/libs/mapbox/images/污水监测.png"},
+
+        {"name": "水质异常", "url": "/static/libs/mapbox/images/污水-水质异常.png"},
+        {"name": "淤堵风险", "url": "/static/libs/mapbox/images/污水-淤堵风险.png"},
+        {"name": "雨水混入", "url": "/static/libs/mapbox/images/污水-雨水混入.png"},
+        {"name": "地下水注入", "url": "/static/libs/mapbox/images/雨水-地下水注入.png"},
+        {"name": "晴天出流", "url": "/static/libs/mapbox/images/雨水-晴天出流.png"},
+        {"name": "污水混入", "url": "/static/libs/mapbox/images/雨水-污水混入.png"},
+
         {"name": "泵车在线", "url": "/static/libs/mapbox/images/泵车在线.png", "width": 15,"height": 20},
         {"name": "泵车离线", "url": "/static/libs/mapbox/images/泵车离线.png", "width": 15,"height": 20},
         {"name": "heigh", "url": "/static/libs/mapbox/images/full_out.gif", "width": 50,"height": 50}
@@ -1167,7 +1166,7 @@
       "layout": {
         "icon-image": [
             "match",
-          ["get", "type"],
+          ["get", "_image"],
             "rain","雨量站扎点@2x",
             "waterlog_point","排渍调度",
             "port_channel_info","港渠扎点@2x",
@@ -1218,7 +1217,21 @@
             "waterlog_community", "渍水点扎点@2x",
             "clickPoint", "selectedLocation",
             "temporary", "selectedLocation",
-            "tran"
+
+          "QTCL","晴天出流",
+          "WSHR","污水混入",
+          "DXSZR","地下水注入",
+
+          "GJMY","地下水注入",
+          "GWMG","地下水注入",
+          "GWGSWYX","地下水注入",
+          "GJMYFX","地下水注入",
+
+          "YSHR","雨水混入",
+          "YDFX","淤堵风险",
+          "SZYC","水质异常",
+
+          "tran"
         ],
         "icon-allow-overlap": false,
         "icon-anchor": "center",
@@ -1445,7 +1458,7 @@
         "text-line-height": 3,
         "text-anchor": "top"
       },
-      "minzoom": 14,
+      "minzoom": 15.5,
       "maxzoom": 24,
       "mType": "geojsonMvt",
       "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry"
@@ -1458,7 +1471,8 @@
         "all",
         ["in", ["get", "管段类型"],["literal", [""]]]
       ],
-      "minzoom": 14,
+      "minzoom": 15.6,
+      "maxzoom": 24,
       "layout": {
         "symbol-placement": "line-center",
         "symbol-spacing": 40,
@@ -1648,5 +1662,3 @@
     "五加湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}
   }
 }
-
-
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index 0704f07..2a6d65b 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -500,18 +500,9 @@
           (a.properties.minzoom = a.properties.minzoom || 0),
             (a.properties.color = a.properties.color || "rgba(0,0,0,1)"),
             (a.properties.type = a.properties.type || i.layername);
-          a.properties.name =
-            a.properties.name ||
-            a.properties.Name ||
-            a.properties.stName ||
-            a.properties.pointNumber ||
-            a.properties.sewageName ||
-            a.properties.sectionName ||
-            a.properties.pumpName;
-          if (
-            a.properties.name &&
-            !turf.getType(a).toLocaleLowerCase().includes("point")
-          ) {
+          a.properties.name = a.properties.name || a.properties.Name || a.properties.stName || a.properties.pointNumber || a.properties.sewageName || a.properties.sectionName || a.properties.pumpName;
+          a.properties._image = a.properties._image || a.properties.type;
+          if (a.properties.name && !turf.getType(a).toLocaleLowerCase().includes("point")) {
             let center = turf.center(a);
             center.properties = { ...a.properties, minzoom: 10,type:a.properties.type +"_text" };
             center.properties.geometry = Terraformer.WKT.convert(center.geometry);
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index ffe7f7b..115d0cd 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -314,16 +314,14 @@
             wsRouteToMapByName(properties);
           },
           () => {
+            const _keys_ =  ['rainwater_pipeline_quality_area1','rainwater_pipeline_quality1'];
+            let kk = _.replace(_keys_[1], /\d+/g, '');
             ys_flow({ ...properties, c_layer: `排水分区_${properties.type}_${properties.level}` }, true);
             let p_feature = turf.flatten(turf.feature(Terraformer.WKT.parse(properties.geometry))).features[0];
-            let features = newfiberMap.map
-              .getSource('point')
-              ._data.features.filter(i => _keys[2].includes(i.properties.type))
-              .filter(o => turf.booleanPointInPolygon(o, p_feature));
-            features = features.map(i =>
-              Object.assign(_.cloneDeep(i), { properties: { ...i.properties, type: i.properties.type + 1 } })
-            );
-            busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: _keys[2] });
+            let features = newfiberMap.map.getSource('point')._data.features.filter(i => i.properties.type.includes(kk)).filter(o => turf.booleanPointInPolygon(o, p_feature));
+            features = features.map(i => Object.assign(_.cloneDeep(i), { properties: { ...i.properties, type: i.properties.type.includes(_keys_[0])?_keys_[0]:_keys_[1] } }));
+            debugger;
+            busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: _keys_[0] });
           },
         ][Number(isYS)]();
       },
@@ -430,14 +428,12 @@
 
   function outletRouteMethod(properties) {
     const _keys = ['排口流向', '排口流向1', 'rainwater_pipeline_quality1'];
-    let sites = turf.featureCollection(
-      outlet_site.features.filter(
-        i => (i.properties.outlet_id || '').split(',').includes(properties.id) && i.properties.connectType != 'area'
-      )
-    );
-    let routes = turf.featureCollection(
-      outlet_route.features.filter(i => (i.properties.outlet_id || '').split(',').includes(properties.id))
-    );
+    let kk = _.replace(_keys[2], /\d+/g, '');
+    let routes = turf.featureCollection(outlet_route.features.filter(i => (i.properties.outlet_id || '').split(',').includes(properties.id)));
+    let polygon = turf.bboxPolygon(turf.bbox(routes));
+    // let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0];
+    let sites = turf.featureCollection(newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.type.includes(kk) && i.properties.connectType == 'city').filter(i => turf.booleanPointInPolygon(i, polygon)).map(i => ({...i,properties:{...i.properties,type:undefined}})));
+    debugger;
     newfiberMap
       .getLayers()
       .filter(i => i.newfiberId == _keys[1])[0]
@@ -708,33 +704,19 @@
     sites: {
       method: getBaseListPoint,
       fields: { geometry: 'geometry', name: 'name' },
-      groupMethod: data =>
-        _.groupBy(
-          data
-            .map(i => i.data)
-            .flat()
-            .filter(i => i.geometry)
-            .map(item => ({ ...item })),
-          v => v.pointType + (v.connectType ? '_' + v.connectType : '')
-        ),
+      groupMethod: data => _.groupBy(data.map(i => i.data).flat().filter(i => i.geometry).map(item => ({ ...item,_image:(item.warnList || [])[0]})), v => v.pointType + (v.connectType ? '_' + v.connectType : '')),
       others: {
         outlet_info: {
           method: data => data.map(i => ({ ...i, type: `${i.pointType}_${i.waterBodyType}_${i.waterBodyId}` })),
-        },
+        }
       },
     },
     //车辆
-    // cheliang: {
-    //   method: supervisionRealinformationList,
-    //   fields: { lng: "longitude", lat: "latitude", name: "plateNumber" },
-    //   groupMethod: (data) =>
-    //           _.groupBy(
-    //                   data.supervisionRealinformationList
-    //                           .filter((i) => i.longitude && i.latitude)
-    //                           .map((item) => ({ ...item, type: item.vehicleCategory + item.status })),
-    //                   (v) => v.type
-    //           ),
-    // },
+/*    cheliang: {
+      method: supervisionRealinformationList,
+      fields: { lng: "longitude", lat: "latitude", name: "plateNumber" },
+      groupMethod: (data) => _.groupBy(data.supervisionRealinformationList.filter((i) => i.longitude && i.latitude).map((item) => ({ ...item, type: item.vehicleCategory + item.status })), (v) => v.type),
+    },*/
   };
   const other_data_params = {};
   let keys = Object.keys(params || data_default_params);

diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
new file mode 100644
index 0000000..9761caa
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\260\264\350\264\250\345\274\202\345\270\270.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
new file mode 100644
index 0000000..06a6fb7
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\346\267\244\345\240\265\351\243\216\351\231\251.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..3c8715e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\346\261\241\346\260\264-\351\233\250\346\260\264\346\267\267\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
new file mode 100644
index 0000000..20173dd
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\345\234\260\344\270\213\346\260\264\346\263\250\345\205\245.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png"
new file mode 100644
index 0000000..b4ed63e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\231\264\345\244\251\345\207\272\346\265\201.png"
Binary files differ
diff --git "a/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.png" "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.png"
new file mode 100644
index 0000000..34be04e
--- /dev/null
+++ "b/public/static/libs/mapbox/images/\351\233\250\346\260\264-\346\261\241\346\260\264\346\267\267\345\205\245.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 5631f4f..82cd64e 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -19,7 +19,7 @@
       "https://supermap14.wh-nf.cn:8090/vt/mvt",
       "https://supermap15.wh-nf.cn:8090/vt/mvt"
     ],
-    "geojson": "https://supermap13.wh-nf.cn:8090/vt/geojson",
+    "geojson": "https://supermap0.wh-nf.cn:8090/vt/geojson",
     "sprites": [
       "/static/libs/mapbox/style/sprite/sprite"
     ],
@@ -51,18 +51,9 @@
     },
     "mapbox": {
       "images": [
-        {
-          "name": "水库水位@2x",
-          "url": "/static/libs/mapbox/images/水库水位@2x.png"
-        },
-        {
-          "name": "污水处理站",
-          "url": "/static/libs/mapbox/images/污水处理站.png"
-        },
-        {
-          "name": "堤防备料@2x",
-          "url": "/static/libs/mapbox/images/堤防备料@2x.png"
-        },
+        {"name": "水库水位@2x", "url": "/static/libs/mapbox/images/水库水位@2x.png"},
+        {"name": "污水处理站", "url": "/static/libs/mapbox/images/污水处理站.png"},
+        {"name": "堤防备料@2x", "url": "/static/libs/mapbox/images/堤防备料@2x.png"},
         {"name": "物资仓库@2x", "url": "/static/libs/mapbox/images/物资仓库@2x.png"},
         {"name": "blockage", "url": "/static/libs/mapbox/images/blockage.png"},
         {"name": "full", "url": "/static/libs/mapbox/images/full.png"},
@@ -73,6 +64,14 @@
         {"name": "selectedLocation", "url": "/static/libs/mapbox/images/selectedLocation.png"},
         {"name": "污水厂", "url": "/static/libs/mapbox/images/污水厂.png"},
         {"name": "污水监测", "url": "/static/libs/mapbox/images/污水监测.png"},
+
+        {"name": "水质异常", "url": "/static/libs/mapbox/images/污水-水质异常.png"},
+        {"name": "淤堵风险", "url": "/static/libs/mapbox/images/污水-淤堵风险.png"},
+        {"name": "雨水混入", "url": "/static/libs/mapbox/images/污水-雨水混入.png"},
+        {"name": "地下水注入", "url": "/static/libs/mapbox/images/雨水-地下水注入.png"},
+        {"name": "晴天出流", "url": "/static/libs/mapbox/images/雨水-晴天出流.png"},
+        {"name": "污水混入", "url": "/static/libs/mapbox/images/雨水-污水混入.png"},
+
         {"name": "泵车在线", "url": "/static/libs/mapbox/images/泵车在线.png", "width": 15,"height": 20},
         {"name": "泵车离线", "url": "/static/libs/mapbox/images/泵车离线.png", "width": 15,"height": 20},
         {"name": "heigh", "url": "/static/libs/mapbox/images/full_out.gif", "width": 50,"height": 50}
@@ -1167,7 +1166,7 @@
       "layout": {
         "icon-image": [
             "match",
-          ["get", "type"],
+          ["get", "_image"],
             "rain","雨量站扎点@2x",
             "waterlog_point","排渍调度",
             "port_channel_info","港渠扎点@2x",
@@ -1218,7 +1217,21 @@
             "waterlog_community", "渍水点扎点@2x",
             "clickPoint", "selectedLocation",
             "temporary", "selectedLocation",
-            "tran"
+
+          "QTCL","晴天出流",
+          "WSHR","污水混入",
+          "DXSZR","地下水注入",
+
+          "GJMY","地下水注入",
+          "GWMG","地下水注入",
+          "GWGSWYX","地下水注入",
+          "GJMYFX","地下水注入",
+
+          "YSHR","雨水混入",
+          "YDFX","淤堵风险",
+          "SZYC","水质异常",
+
+          "tran"
         ],
         "icon-allow-overlap": false,
         "icon-anchor": "center",
@@ -1445,7 +1458,7 @@
         "text-line-height": 3,
         "text-anchor": "top"
       },
-      "minzoom": 14,
+      "minzoom": 15.5,
       "maxzoom": 24,
       "mType": "geojsonMvt",
       "columns": "point_number AS 外业点号,appendage AS 附属物, point_type AS 类型, area_water as 流域, ys as 雨水系统, ws as 污水系统,st_asText(geometrys) as geometry"
@@ -1458,7 +1471,8 @@
         "all",
         ["in", ["get", "管段类型"],["literal", [""]]]
       ],
-      "minzoom": 14,
+      "minzoom": 15.6,
+      "maxzoom": 24,
       "layout": {
         "symbol-placement": "line-center",
         "symbol-spacing": 40,
@@ -1648,5 +1662,3 @@
     "五加湖": {"layerName": ["港渠", "港渠_text"], "filter": [[],[]]}
   }
 }
-
-
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index 0704f07..2a6d65b 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -500,18 +500,9 @@
           (a.properties.minzoom = a.properties.minzoom || 0),
             (a.properties.color = a.properties.color || "rgba(0,0,0,1)"),
             (a.properties.type = a.properties.type || i.layername);
-          a.properties.name =
-            a.properties.name ||
-            a.properties.Name ||
-            a.properties.stName ||
-            a.properties.pointNumber ||
-            a.properties.sewageName ||
-            a.properties.sectionName ||
-            a.properties.pumpName;
-          if (
-            a.properties.name &&
-            !turf.getType(a).toLocaleLowerCase().includes("point")
-          ) {
+          a.properties.name = a.properties.name || a.properties.Name || a.properties.stName || a.properties.pointNumber || a.properties.sewageName || a.properties.sectionName || a.properties.pumpName;
+          a.properties._image = a.properties._image || a.properties.type;
+          if (a.properties.name && !turf.getType(a).toLocaleLowerCase().includes("point")) {
             let center = turf.center(a);
             center.properties = { ...a.properties, minzoom: 10,type:a.properties.type +"_text" };
             center.properties.geometry = Terraformer.WKT.convert(center.geometry);
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index ffe7f7b..115d0cd 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -314,16 +314,14 @@
             wsRouteToMapByName(properties);
           },
           () => {
+            const _keys_ =  ['rainwater_pipeline_quality_area1','rainwater_pipeline_quality1'];
+            let kk = _.replace(_keys_[1], /\d+/g, '');
             ys_flow({ ...properties, c_layer: `排水分区_${properties.type}_${properties.level}` }, true);
             let p_feature = turf.flatten(turf.feature(Terraformer.WKT.parse(properties.geometry))).features[0];
-            let features = newfiberMap.map
-              .getSource('point')
-              ._data.features.filter(i => _keys[2].includes(i.properties.type))
-              .filter(o => turf.booleanPointInPolygon(o, p_feature));
-            features = features.map(i =>
-              Object.assign(_.cloneDeep(i), { properties: { ...i.properties, type: i.properties.type + 1 } })
-            );
-            busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: _keys[2] });
+            let features = newfiberMap.map.getSource('point')._data.features.filter(i => i.properties.type.includes(kk)).filter(o => turf.booleanPointInPolygon(o, p_feature));
+            features = features.map(i => Object.assign(_.cloneDeep(i), { properties: { ...i.properties, type: i.properties.type.includes(_keys_[0])?_keys_[0]:_keys_[1] } }));
+            debugger;
+            busEmit(setGeoJSON.key, { json: turf.featureCollection(features), key: _keys_[0] });
           },
         ][Number(isYS)]();
       },
@@ -430,14 +428,12 @@
 
   function outletRouteMethod(properties) {
     const _keys = ['排口流向', '排口流向1', 'rainwater_pipeline_quality1'];
-    let sites = turf.featureCollection(
-      outlet_site.features.filter(
-        i => (i.properties.outlet_id || '').split(',').includes(properties.id) && i.properties.connectType != 'area'
-      )
-    );
-    let routes = turf.featureCollection(
-      outlet_route.features.filter(i => (i.properties.outlet_id || '').split(',').includes(properties.id))
-    );
+    let kk = _.replace(_keys[2], /\d+/g, '');
+    let routes = turf.featureCollection(outlet_route.features.filter(i => (i.properties.outlet_id || '').split(',').includes(properties.id)));
+    let polygon = turf.bboxPolygon(turf.bbox(routes));
+    // let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0];
+    let sites = turf.featureCollection(newfiberMap.map.getSource("point")._data.features.filter(i => i.properties.type.includes(kk) && i.properties.connectType == 'city').filter(i => turf.booleanPointInPolygon(i, polygon)).map(i => ({...i,properties:{...i.properties,type:undefined}})));
+    debugger;
     newfiberMap
       .getLayers()
       .filter(i => i.newfiberId == _keys[1])[0]
@@ -708,33 +704,19 @@
     sites: {
       method: getBaseListPoint,
       fields: { geometry: 'geometry', name: 'name' },
-      groupMethod: data =>
-        _.groupBy(
-          data
-            .map(i => i.data)
-            .flat()
-            .filter(i => i.geometry)
-            .map(item => ({ ...item })),
-          v => v.pointType + (v.connectType ? '_' + v.connectType : '')
-        ),
+      groupMethod: data => _.groupBy(data.map(i => i.data).flat().filter(i => i.geometry).map(item => ({ ...item,_image:(item.warnList || [])[0]})), v => v.pointType + (v.connectType ? '_' + v.connectType : '')),
       others: {
         outlet_info: {
           method: data => data.map(i => ({ ...i, type: `${i.pointType}_${i.waterBodyType}_${i.waterBodyId}` })),
-        },
+        }
       },
     },
     //车辆
-    // cheliang: {
-    //   method: supervisionRealinformationList,
-    //   fields: { lng: "longitude", lat: "latitude", name: "plateNumber" },
-    //   groupMethod: (data) =>
-    //           _.groupBy(
-    //                   data.supervisionRealinformationList
-    //                           .filter((i) => i.longitude && i.latitude)
-    //                           .map((item) => ({ ...item, type: item.vehicleCategory + item.status })),
-    //                   (v) => v.type
-    //           ),
-    // },
+/*    cheliang: {
+      method: supervisionRealinformationList,
+      fields: { lng: "longitude", lat: "latitude", name: "plateNumber" },
+      groupMethod: (data) => _.groupBy(data.supervisionRealinformationList.filter((i) => i.longitude && i.latitude).map((item) => ({ ...item, type: item.vehicleCategory + item.status })), (v) => v.type),
+    },*/
   };
   const other_data_params = {};
   let keys = Object.keys(params || data_default_params);
diff --git a/vite.config.js b/vite.config.js
index 9ba7c16..4ddbb34 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -5,9 +5,9 @@
 import autoprefixer from 'autoprefixer';
 
 const Timestamp = new Date().getTime(); //随机时间戳
-// let ipLink = 'https://server1.wh-nf.cn:8201/prod-api';
+let ipLink = 'https://server1.wh-nf.cn:8201/prod-api';
 // let ipLink = 'http://192.168.16.135:9100';
-let ipLink = 'http://192.168.16.124:9100';
+// let ipLink = 'http://192.168.16.124:9100';
 // let ipLink = 'http://192.168.20.43:9100'; // 刘总
 /*  */
 // https://vitejs.dev/config/