diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 6ca769f..ddc74d0 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
   "params": {
     "basemap": "https://supermap2.wh-nf.cn:8090/bm",
     "mvt": "https://supermap0.wh-nf.cn:8090/vt",
-    "sprites": [
-      "/static/libs/mapbox/style/sprite/sprite5"
-    ],
+    "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
     "init": {
-      "center": [
-        114.315,
-        34.852
-      ],
+      "center": [114.315, 34.852],
       "zoom": 10.4,
       "pitch": 30,
       "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
       "params": {
         "id": "newfiber-XYZLayer",
         "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ],
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
         "minZoom": 1,
         "maxZoom": 19,
         "tileType": ""
@@ -51,9 +37,7 @@
       "methods": [
         {
           "name": "addTo",
-          "params": [
-            "''||map"
-          ]
+          "params": ["''||map"]
         },
         {
           "name": "hide",
@@ -67,16 +51,7 @@
       "params": {
         "id": "newfiber-WMTSLayer",
         "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ]
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
       },
       "methods": []
     },
@@ -85,12 +60,7 @@
       "type": "CanvasLayer",
       "params": {
         "id": "newfiber-CanvasLayer",
-        "bbox": [
-          110.98300209463804,
-          32.415967161418266,
-          111.34992583909221,
-          32.599933881244255
-        ],
+        "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
         "width": 3000,
         "height": 1172,
         "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "color",
@@ -165,21 +133,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            4
-          ]
+          "params": [4]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -224,28 +186,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(236,223,25,1.0)"
-          ]
+          "params": ["rgba(236,223,25,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            "size",
-            "''||function(v){return v}"
-          ]
+          "params": ["size", "''||function(v){return v}"]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -269,21 +222,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            3
-          ]
+          "params": [3]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -328,27 +275,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(255,0,0,1.0)"
-          ]
+          "params": ["rgba(255,0,0,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            10
-          ]
+          "params": [10]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -372,24 +311,17 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "map_selected"
-          ]
+          "params": ["map_selected"]
         },
         {
           "name": "size",
-          "params": [
-            30
-          ]
+          "params": [30]
         },
         {
           "name": "style",
           "params": [
             {
-              "offsets": [
-                0,
-                0
-              ]
+              "offsets": [0, 0]
             }
           ]
         }
@@ -406,21 +338,15 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "size",
-          "params": [
-            2
-          ]
+          "params": [2]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(189, 209, 150,1)"
-          ]
+          "params": ["rgba(189, 209, 150,1)"]
         }
       ]
     }
@@ -445,26 +371,9 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "line",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
-        "line-color": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "#1b76ff",
-          "ws",
-          "#ff4c61",
-          "hs",
-          "#ff80ec",
-          "#000000"
-        ],
+        "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"],
         "line-width": 4
       },
       "layout": {},
@@ -478,27 +387,15 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "layout": {
-        "text-field": [
-          "get",
-          "管径"
-        ],
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-field": ["get", "管径"],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": 15,
         "text-transform": "uppercase",
         "symbol-placement": "line",
-        "text-offset": [
-          0,
-          -0.5
-        ],
+        "text-offset": [0, 1.5],
         "text-allow-overlap": true,
         "text-letter-spacing": 1.1
       },
@@ -518,10 +415,7 @@
       "paint": {
         "fill-color": [
           "match",
-          [
-            "get",
-            "dlmc"
-          ],
+          ["get", "dlmc"],
           "水浇地",
           "#fbe5ab",
           "果园",
@@ -614,16 +508,9 @@
       "key": "hubei_xiaogan_hm_city_boundary",
       "source-layer": "hubei_xiaogan_hm_city_boundary",
       "type": "fill",
-      "filter": [
-        "in",
-        "name",
-        ""
-      ],
+      "filter": ["in", "name", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ]
+        "fill-color": ["get", "fill_color"]
       },
       "layout": {},
       "minzoom": 10,
@@ -636,16 +523,9 @@
       "key": "hubei_xiaogan_hm_psfq",
       "source-layer": "hubei_xiaogan_hm_psfq",
       "type": "fill",
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ],
+        "fill-color": ["get", "fill_color"],
         "fill-opacity": 0.4
       },
       "layout": {},
@@ -659,36 +539,17 @@
       "key": "hn_kf_hm_pipeline_point",
       "source-layer": "hn_kf_hm_pipeline_point",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
         "text-halo-width": 2
       },
       "layout": {
-        "icon-image": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "ysj",
-          "ws",
-          "wsj",
-          "hs",
-          "hsj",
-          "ysbz"
-        ],
+        "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
         "icon-size": 0.5,
         "text-field": "{管线点号}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 13,
         "text-line-height": 3,
         "text-anchor": "top"
@@ -704,11 +565,7 @@
       "type": "symbol",
       "minzoom": 0,
       "maxzoom": 24,
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
@@ -717,10 +574,7 @@
       "layout": {
         "icon-image": [
           "match",
-          [
-            "get",
-            "type"
-          ],
+          ["get", "type"],
           "YSBZ",
           "rainBengZhan_icon",
           "WSBZ",
@@ -750,207 +604,86 @@
         "icon-anchor": "center",
         "icon-size": 0.8,
         "text-field": "{name}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 15,
         "text-line-height": 3,
         "text-anchor": "bottom",
         "text-max-width": 50,
-        "text-offset": [
-          0,
-          3
-        ]
+        "text-offset": [0, 3]
       },
       "mType": "geojson"
     }
   ],
   "orders": [
-    [
-      "newfiber-XYZLayer"
-    ],
-    [
-      "hubei_xiaogan_hm_psfq"
-    ],
-    [
-      "city_boundary"
-    ],
-    [
-      "all_boundary"
-    ],
-    [
-      "pipeline_info"
-    ],
-    [
-      "pipeline_point"
-    ],
-    [
-      "pipeLineLabel"
-    ],
-    [
-      "poi_label"
-    ],
-    [
-      "place_label_city"
-    ],
-    [
-      "road_major_label"
-    ],
-    [
-      "place_label_other"
-    ],
-    [
-      "point"
-    ]
+    ["newfiber-XYZLayer"],
+    ["hubei_xiaogan_hm_psfq"],
+    ["city_boundary"],
+    ["all_boundary"],
+    ["pipeline_info"],
+    ["pipeline_point"],
+    ["pipeLineLabel"],
+    ["poi_label"],
+    ["place_label_city"],
+    ["road_major_label"],
+    ["place_label_other"],
+    ["point"]
   ],
   "filter": {
     "wsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ws"], ["ws"], ["ws"]]
     },
     "hsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["hs"], ["hs"], ["hs"]]
     },
     "ysLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ys"], ["ys"], ["ys"]]
     },
     "YSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "YS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["YS"]]
     },
     "WSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "WS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["WS"]]
     },
     "oldCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["老城区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.926
-        ],
+        "center": [113.933, 30.926],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "southCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "南城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["南城新区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.886
-        ],
+        "center": [113.933, 30.886],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "newCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区"]],
       "easeTo": {
-        "center": [
-          113.983,
-          30.896
-        ],
+        "center": [113.983, 30.896],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "allCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区",
-          "南城新区",
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区", "南城新区", "老城区"]],
       "easeTo": {
-        "center": [
-          113.953,
-          30.906
-        ],
+        "center": [113.953, 30.906],
         "zoom": 13.6,
         "pitch": 55
       }
     }
   }
-}
\ No newline at end of file
+}

diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 6ca769f..ddc74d0 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
   "params": {
     "basemap": "https://supermap2.wh-nf.cn:8090/bm",
     "mvt": "https://supermap0.wh-nf.cn:8090/vt",
-    "sprites": [
-      "/static/libs/mapbox/style/sprite/sprite5"
-    ],
+    "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
     "init": {
-      "center": [
-        114.315,
-        34.852
-      ],
+      "center": [114.315, 34.852],
       "zoom": 10.4,
       "pitch": 30,
       "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
       "params": {
         "id": "newfiber-XYZLayer",
         "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ],
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
         "minZoom": 1,
         "maxZoom": 19,
         "tileType": ""
@@ -51,9 +37,7 @@
       "methods": [
         {
           "name": "addTo",
-          "params": [
-            "''||map"
-          ]
+          "params": ["''||map"]
         },
         {
           "name": "hide",
@@ -67,16 +51,7 @@
       "params": {
         "id": "newfiber-WMTSLayer",
         "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ]
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
       },
       "methods": []
     },
@@ -85,12 +60,7 @@
       "type": "CanvasLayer",
       "params": {
         "id": "newfiber-CanvasLayer",
-        "bbox": [
-          110.98300209463804,
-          32.415967161418266,
-          111.34992583909221,
-          32.599933881244255
-        ],
+        "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
         "width": 3000,
         "height": 1172,
         "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "color",
@@ -165,21 +133,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            4
-          ]
+          "params": [4]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -224,28 +186,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(236,223,25,1.0)"
-          ]
+          "params": ["rgba(236,223,25,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            "size",
-            "''||function(v){return v}"
-          ]
+          "params": ["size", "''||function(v){return v}"]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -269,21 +222,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            3
-          ]
+          "params": [3]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -328,27 +275,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(255,0,0,1.0)"
-          ]
+          "params": ["rgba(255,0,0,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            10
-          ]
+          "params": [10]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -372,24 +311,17 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "map_selected"
-          ]
+          "params": ["map_selected"]
         },
         {
           "name": "size",
-          "params": [
-            30
-          ]
+          "params": [30]
         },
         {
           "name": "style",
           "params": [
             {
-              "offsets": [
-                0,
-                0
-              ]
+              "offsets": [0, 0]
             }
           ]
         }
@@ -406,21 +338,15 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "size",
-          "params": [
-            2
-          ]
+          "params": [2]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(189, 209, 150,1)"
-          ]
+          "params": ["rgba(189, 209, 150,1)"]
         }
       ]
     }
@@ -445,26 +371,9 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "line",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
-        "line-color": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "#1b76ff",
-          "ws",
-          "#ff4c61",
-          "hs",
-          "#ff80ec",
-          "#000000"
-        ],
+        "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"],
         "line-width": 4
       },
       "layout": {},
@@ -478,27 +387,15 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "layout": {
-        "text-field": [
-          "get",
-          "管径"
-        ],
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-field": ["get", "管径"],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": 15,
         "text-transform": "uppercase",
         "symbol-placement": "line",
-        "text-offset": [
-          0,
-          -0.5
-        ],
+        "text-offset": [0, 1.5],
         "text-allow-overlap": true,
         "text-letter-spacing": 1.1
       },
@@ -518,10 +415,7 @@
       "paint": {
         "fill-color": [
           "match",
-          [
-            "get",
-            "dlmc"
-          ],
+          ["get", "dlmc"],
           "水浇地",
           "#fbe5ab",
           "果园",
@@ -614,16 +508,9 @@
       "key": "hubei_xiaogan_hm_city_boundary",
       "source-layer": "hubei_xiaogan_hm_city_boundary",
       "type": "fill",
-      "filter": [
-        "in",
-        "name",
-        ""
-      ],
+      "filter": ["in", "name", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ]
+        "fill-color": ["get", "fill_color"]
       },
       "layout": {},
       "minzoom": 10,
@@ -636,16 +523,9 @@
       "key": "hubei_xiaogan_hm_psfq",
       "source-layer": "hubei_xiaogan_hm_psfq",
       "type": "fill",
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ],
+        "fill-color": ["get", "fill_color"],
         "fill-opacity": 0.4
       },
       "layout": {},
@@ -659,36 +539,17 @@
       "key": "hn_kf_hm_pipeline_point",
       "source-layer": "hn_kf_hm_pipeline_point",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
         "text-halo-width": 2
       },
       "layout": {
-        "icon-image": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "ysj",
-          "ws",
-          "wsj",
-          "hs",
-          "hsj",
-          "ysbz"
-        ],
+        "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
         "icon-size": 0.5,
         "text-field": "{管线点号}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 13,
         "text-line-height": 3,
         "text-anchor": "top"
@@ -704,11 +565,7 @@
       "type": "symbol",
       "minzoom": 0,
       "maxzoom": 24,
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
@@ -717,10 +574,7 @@
       "layout": {
         "icon-image": [
           "match",
-          [
-            "get",
-            "type"
-          ],
+          ["get", "type"],
           "YSBZ",
           "rainBengZhan_icon",
           "WSBZ",
@@ -750,207 +604,86 @@
         "icon-anchor": "center",
         "icon-size": 0.8,
         "text-field": "{name}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 15,
         "text-line-height": 3,
         "text-anchor": "bottom",
         "text-max-width": 50,
-        "text-offset": [
-          0,
-          3
-        ]
+        "text-offset": [0, 3]
       },
       "mType": "geojson"
     }
   ],
   "orders": [
-    [
-      "newfiber-XYZLayer"
-    ],
-    [
-      "hubei_xiaogan_hm_psfq"
-    ],
-    [
-      "city_boundary"
-    ],
-    [
-      "all_boundary"
-    ],
-    [
-      "pipeline_info"
-    ],
-    [
-      "pipeline_point"
-    ],
-    [
-      "pipeLineLabel"
-    ],
-    [
-      "poi_label"
-    ],
-    [
-      "place_label_city"
-    ],
-    [
-      "road_major_label"
-    ],
-    [
-      "place_label_other"
-    ],
-    [
-      "point"
-    ]
+    ["newfiber-XYZLayer"],
+    ["hubei_xiaogan_hm_psfq"],
+    ["city_boundary"],
+    ["all_boundary"],
+    ["pipeline_info"],
+    ["pipeline_point"],
+    ["pipeLineLabel"],
+    ["poi_label"],
+    ["place_label_city"],
+    ["road_major_label"],
+    ["place_label_other"],
+    ["point"]
   ],
   "filter": {
     "wsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ws"], ["ws"], ["ws"]]
     },
     "hsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["hs"], ["hs"], ["hs"]]
     },
     "ysLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ys"], ["ys"], ["ys"]]
     },
     "YSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "YS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["YS"]]
     },
     "WSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "WS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["WS"]]
     },
     "oldCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["老城区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.926
-        ],
+        "center": [113.933, 30.926],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "southCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "南城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["南城新区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.886
-        ],
+        "center": [113.933, 30.886],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "newCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区"]],
       "easeTo": {
-        "center": [
-          113.983,
-          30.896
-        ],
+        "center": [113.983, 30.896],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "allCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区",
-          "南城新区",
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区", "南城新区", "老城区"]],
       "easeTo": {
-        "center": [
-          113.953,
-          30.906
-        ],
+        "center": [113.953, 30.906],
         "zoom": 13.6,
         "pitch": 55
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/newImgs/pumpGY/dxxmBg.jpg b/src/assets/newImgs/pumpGY/dxxmBg.jpg
new file mode 100644
index 0000000..1c2a625
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/dxxmBg.jpg
Binary files differ

diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 6ca769f..ddc74d0 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
   "params": {
     "basemap": "https://supermap2.wh-nf.cn:8090/bm",
     "mvt": "https://supermap0.wh-nf.cn:8090/vt",
-    "sprites": [
-      "/static/libs/mapbox/style/sprite/sprite5"
-    ],
+    "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
     "init": {
-      "center": [
-        114.315,
-        34.852
-      ],
+      "center": [114.315, 34.852],
       "zoom": 10.4,
       "pitch": 30,
       "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
       "params": {
         "id": "newfiber-XYZLayer",
         "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ],
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
         "minZoom": 1,
         "maxZoom": 19,
         "tileType": ""
@@ -51,9 +37,7 @@
       "methods": [
         {
           "name": "addTo",
-          "params": [
-            "''||map"
-          ]
+          "params": ["''||map"]
         },
         {
           "name": "hide",
@@ -67,16 +51,7 @@
       "params": {
         "id": "newfiber-WMTSLayer",
         "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ]
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
       },
       "methods": []
     },
@@ -85,12 +60,7 @@
       "type": "CanvasLayer",
       "params": {
         "id": "newfiber-CanvasLayer",
-        "bbox": [
-          110.98300209463804,
-          32.415967161418266,
-          111.34992583909221,
-          32.599933881244255
-        ],
+        "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
         "width": 3000,
         "height": 1172,
         "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "color",
@@ -165,21 +133,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            4
-          ]
+          "params": [4]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -224,28 +186,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(236,223,25,1.0)"
-          ]
+          "params": ["rgba(236,223,25,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            "size",
-            "''||function(v){return v}"
-          ]
+          "params": ["size", "''||function(v){return v}"]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -269,21 +222,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            3
-          ]
+          "params": [3]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -328,27 +275,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(255,0,0,1.0)"
-          ]
+          "params": ["rgba(255,0,0,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            10
-          ]
+          "params": [10]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -372,24 +311,17 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "map_selected"
-          ]
+          "params": ["map_selected"]
         },
         {
           "name": "size",
-          "params": [
-            30
-          ]
+          "params": [30]
         },
         {
           "name": "style",
           "params": [
             {
-              "offsets": [
-                0,
-                0
-              ]
+              "offsets": [0, 0]
             }
           ]
         }
@@ -406,21 +338,15 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "size",
-          "params": [
-            2
-          ]
+          "params": [2]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(189, 209, 150,1)"
-          ]
+          "params": ["rgba(189, 209, 150,1)"]
         }
       ]
     }
@@ -445,26 +371,9 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "line",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
-        "line-color": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "#1b76ff",
-          "ws",
-          "#ff4c61",
-          "hs",
-          "#ff80ec",
-          "#000000"
-        ],
+        "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"],
         "line-width": 4
       },
       "layout": {},
@@ -478,27 +387,15 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "layout": {
-        "text-field": [
-          "get",
-          "管径"
-        ],
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-field": ["get", "管径"],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": 15,
         "text-transform": "uppercase",
         "symbol-placement": "line",
-        "text-offset": [
-          0,
-          -0.5
-        ],
+        "text-offset": [0, 1.5],
         "text-allow-overlap": true,
         "text-letter-spacing": 1.1
       },
@@ -518,10 +415,7 @@
       "paint": {
         "fill-color": [
           "match",
-          [
-            "get",
-            "dlmc"
-          ],
+          ["get", "dlmc"],
           "水浇地",
           "#fbe5ab",
           "果园",
@@ -614,16 +508,9 @@
       "key": "hubei_xiaogan_hm_city_boundary",
       "source-layer": "hubei_xiaogan_hm_city_boundary",
       "type": "fill",
-      "filter": [
-        "in",
-        "name",
-        ""
-      ],
+      "filter": ["in", "name", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ]
+        "fill-color": ["get", "fill_color"]
       },
       "layout": {},
       "minzoom": 10,
@@ -636,16 +523,9 @@
       "key": "hubei_xiaogan_hm_psfq",
       "source-layer": "hubei_xiaogan_hm_psfq",
       "type": "fill",
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ],
+        "fill-color": ["get", "fill_color"],
         "fill-opacity": 0.4
       },
       "layout": {},
@@ -659,36 +539,17 @@
       "key": "hn_kf_hm_pipeline_point",
       "source-layer": "hn_kf_hm_pipeline_point",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
         "text-halo-width": 2
       },
       "layout": {
-        "icon-image": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "ysj",
-          "ws",
-          "wsj",
-          "hs",
-          "hsj",
-          "ysbz"
-        ],
+        "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
         "icon-size": 0.5,
         "text-field": "{管线点号}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 13,
         "text-line-height": 3,
         "text-anchor": "top"
@@ -704,11 +565,7 @@
       "type": "symbol",
       "minzoom": 0,
       "maxzoom": 24,
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
@@ -717,10 +574,7 @@
       "layout": {
         "icon-image": [
           "match",
-          [
-            "get",
-            "type"
-          ],
+          ["get", "type"],
           "YSBZ",
           "rainBengZhan_icon",
           "WSBZ",
@@ -750,207 +604,86 @@
         "icon-anchor": "center",
         "icon-size": 0.8,
         "text-field": "{name}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 15,
         "text-line-height": 3,
         "text-anchor": "bottom",
         "text-max-width": 50,
-        "text-offset": [
-          0,
-          3
-        ]
+        "text-offset": [0, 3]
       },
       "mType": "geojson"
     }
   ],
   "orders": [
-    [
-      "newfiber-XYZLayer"
-    ],
-    [
-      "hubei_xiaogan_hm_psfq"
-    ],
-    [
-      "city_boundary"
-    ],
-    [
-      "all_boundary"
-    ],
-    [
-      "pipeline_info"
-    ],
-    [
-      "pipeline_point"
-    ],
-    [
-      "pipeLineLabel"
-    ],
-    [
-      "poi_label"
-    ],
-    [
-      "place_label_city"
-    ],
-    [
-      "road_major_label"
-    ],
-    [
-      "place_label_other"
-    ],
-    [
-      "point"
-    ]
+    ["newfiber-XYZLayer"],
+    ["hubei_xiaogan_hm_psfq"],
+    ["city_boundary"],
+    ["all_boundary"],
+    ["pipeline_info"],
+    ["pipeline_point"],
+    ["pipeLineLabel"],
+    ["poi_label"],
+    ["place_label_city"],
+    ["road_major_label"],
+    ["place_label_other"],
+    ["point"]
   ],
   "filter": {
     "wsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ws"], ["ws"], ["ws"]]
     },
     "hsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["hs"], ["hs"], ["hs"]]
     },
     "ysLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ys"], ["ys"], ["ys"]]
     },
     "YSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "YS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["YS"]]
     },
     "WSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "WS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["WS"]]
     },
     "oldCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["老城区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.926
-        ],
+        "center": [113.933, 30.926],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "southCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "南城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["南城新区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.886
-        ],
+        "center": [113.933, 30.886],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "newCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区"]],
       "easeTo": {
-        "center": [
-          113.983,
-          30.896
-        ],
+        "center": [113.983, 30.896],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "allCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区",
-          "南城新区",
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区", "南城新区", "老城区"]],
       "easeTo": {
-        "center": [
-          113.953,
-          30.906
-        ],
+        "center": [113.953, 30.906],
         "zoom": 13.6,
         "pitch": 55
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/newImgs/pumpGY/dxxmBg.jpg b/src/assets/newImgs/pumpGY/dxxmBg.jpg
new file mode 100644
index 0000000..1c2a625
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/dxxmBg.jpg
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/titleBg.png b/src/assets/newImgs/pumpGY/titleBg.png
new file mode 100644
index 0000000..08d95b0
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/titleBg.png
Binary files differ

diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 6ca769f..ddc74d0 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
   "params": {
     "basemap": "https://supermap2.wh-nf.cn:8090/bm",
     "mvt": "https://supermap0.wh-nf.cn:8090/vt",
-    "sprites": [
-      "/static/libs/mapbox/style/sprite/sprite5"
-    ],
+    "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
     "init": {
-      "center": [
-        114.315,
-        34.852
-      ],
+      "center": [114.315, 34.852],
       "zoom": 10.4,
       "pitch": 30,
       "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
       "params": {
         "id": "newfiber-XYZLayer",
         "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ],
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
         "minZoom": 1,
         "maxZoom": 19,
         "tileType": ""
@@ -51,9 +37,7 @@
       "methods": [
         {
           "name": "addTo",
-          "params": [
-            "''||map"
-          ]
+          "params": ["''||map"]
         },
         {
           "name": "hide",
@@ -67,16 +51,7 @@
       "params": {
         "id": "newfiber-WMTSLayer",
         "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ]
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
       },
       "methods": []
     },
@@ -85,12 +60,7 @@
       "type": "CanvasLayer",
       "params": {
         "id": "newfiber-CanvasLayer",
-        "bbox": [
-          110.98300209463804,
-          32.415967161418266,
-          111.34992583909221,
-          32.599933881244255
-        ],
+        "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
         "width": 3000,
         "height": 1172,
         "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "color",
@@ -165,21 +133,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            4
-          ]
+          "params": [4]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -224,28 +186,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(236,223,25,1.0)"
-          ]
+          "params": ["rgba(236,223,25,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            "size",
-            "''||function(v){return v}"
-          ]
+          "params": ["size", "''||function(v){return v}"]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -269,21 +222,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            3
-          ]
+          "params": [3]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -328,27 +275,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(255,0,0,1.0)"
-          ]
+          "params": ["rgba(255,0,0,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            10
-          ]
+          "params": [10]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -372,24 +311,17 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "map_selected"
-          ]
+          "params": ["map_selected"]
         },
         {
           "name": "size",
-          "params": [
-            30
-          ]
+          "params": [30]
         },
         {
           "name": "style",
           "params": [
             {
-              "offsets": [
-                0,
-                0
-              ]
+              "offsets": [0, 0]
             }
           ]
         }
@@ -406,21 +338,15 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "size",
-          "params": [
-            2
-          ]
+          "params": [2]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(189, 209, 150,1)"
-          ]
+          "params": ["rgba(189, 209, 150,1)"]
         }
       ]
     }
@@ -445,26 +371,9 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "line",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
-        "line-color": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "#1b76ff",
-          "ws",
-          "#ff4c61",
-          "hs",
-          "#ff80ec",
-          "#000000"
-        ],
+        "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"],
         "line-width": 4
       },
       "layout": {},
@@ -478,27 +387,15 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "layout": {
-        "text-field": [
-          "get",
-          "管径"
-        ],
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-field": ["get", "管径"],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": 15,
         "text-transform": "uppercase",
         "symbol-placement": "line",
-        "text-offset": [
-          0,
-          -0.5
-        ],
+        "text-offset": [0, 1.5],
         "text-allow-overlap": true,
         "text-letter-spacing": 1.1
       },
@@ -518,10 +415,7 @@
       "paint": {
         "fill-color": [
           "match",
-          [
-            "get",
-            "dlmc"
-          ],
+          ["get", "dlmc"],
           "水浇地",
           "#fbe5ab",
           "果园",
@@ -614,16 +508,9 @@
       "key": "hubei_xiaogan_hm_city_boundary",
       "source-layer": "hubei_xiaogan_hm_city_boundary",
       "type": "fill",
-      "filter": [
-        "in",
-        "name",
-        ""
-      ],
+      "filter": ["in", "name", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ]
+        "fill-color": ["get", "fill_color"]
       },
       "layout": {},
       "minzoom": 10,
@@ -636,16 +523,9 @@
       "key": "hubei_xiaogan_hm_psfq",
       "source-layer": "hubei_xiaogan_hm_psfq",
       "type": "fill",
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ],
+        "fill-color": ["get", "fill_color"],
         "fill-opacity": 0.4
       },
       "layout": {},
@@ -659,36 +539,17 @@
       "key": "hn_kf_hm_pipeline_point",
       "source-layer": "hn_kf_hm_pipeline_point",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
         "text-halo-width": 2
       },
       "layout": {
-        "icon-image": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "ysj",
-          "ws",
-          "wsj",
-          "hs",
-          "hsj",
-          "ysbz"
-        ],
+        "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
         "icon-size": 0.5,
         "text-field": "{管线点号}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 13,
         "text-line-height": 3,
         "text-anchor": "top"
@@ -704,11 +565,7 @@
       "type": "symbol",
       "minzoom": 0,
       "maxzoom": 24,
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
@@ -717,10 +574,7 @@
       "layout": {
         "icon-image": [
           "match",
-          [
-            "get",
-            "type"
-          ],
+          ["get", "type"],
           "YSBZ",
           "rainBengZhan_icon",
           "WSBZ",
@@ -750,207 +604,86 @@
         "icon-anchor": "center",
         "icon-size": 0.8,
         "text-field": "{name}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 15,
         "text-line-height": 3,
         "text-anchor": "bottom",
         "text-max-width": 50,
-        "text-offset": [
-          0,
-          3
-        ]
+        "text-offset": [0, 3]
       },
       "mType": "geojson"
     }
   ],
   "orders": [
-    [
-      "newfiber-XYZLayer"
-    ],
-    [
-      "hubei_xiaogan_hm_psfq"
-    ],
-    [
-      "city_boundary"
-    ],
-    [
-      "all_boundary"
-    ],
-    [
-      "pipeline_info"
-    ],
-    [
-      "pipeline_point"
-    ],
-    [
-      "pipeLineLabel"
-    ],
-    [
-      "poi_label"
-    ],
-    [
-      "place_label_city"
-    ],
-    [
-      "road_major_label"
-    ],
-    [
-      "place_label_other"
-    ],
-    [
-      "point"
-    ]
+    ["newfiber-XYZLayer"],
+    ["hubei_xiaogan_hm_psfq"],
+    ["city_boundary"],
+    ["all_boundary"],
+    ["pipeline_info"],
+    ["pipeline_point"],
+    ["pipeLineLabel"],
+    ["poi_label"],
+    ["place_label_city"],
+    ["road_major_label"],
+    ["place_label_other"],
+    ["point"]
   ],
   "filter": {
     "wsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ws"], ["ws"], ["ws"]]
     },
     "hsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["hs"], ["hs"], ["hs"]]
     },
     "ysLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ys"], ["ys"], ["ys"]]
     },
     "YSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "YS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["YS"]]
     },
     "WSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "WS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["WS"]]
     },
     "oldCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["老城区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.926
-        ],
+        "center": [113.933, 30.926],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "southCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "南城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["南城新区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.886
-        ],
+        "center": [113.933, 30.886],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "newCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区"]],
       "easeTo": {
-        "center": [
-          113.983,
-          30.896
-        ],
+        "center": [113.983, 30.896],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "allCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区",
-          "南城新区",
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区", "南城新区", "老城区"]],
       "easeTo": {
-        "center": [
-          113.953,
-          30.906
-        ],
+        "center": [113.953, 30.906],
         "zoom": 13.6,
         "pitch": 55
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/newImgs/pumpGY/dxxmBg.jpg b/src/assets/newImgs/pumpGY/dxxmBg.jpg
new file mode 100644
index 0000000..1c2a625
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/dxxmBg.jpg
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/titleBg.png b/src/assets/newImgs/pumpGY/titleBg.png
new file mode 100644
index 0000000..08d95b0
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/titleBg.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/waterFlow.png b/src/assets/newImgs/pumpGY/waterFlow.png
new file mode 100644
index 0000000..3813537
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/waterFlow.png
Binary files differ

diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 6ca769f..ddc74d0 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
   "params": {
     "basemap": "https://supermap2.wh-nf.cn:8090/bm",
     "mvt": "https://supermap0.wh-nf.cn:8090/vt",
-    "sprites": [
-      "/static/libs/mapbox/style/sprite/sprite5"
-    ],
+    "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
     "init": {
-      "center": [
-        114.315,
-        34.852
-      ],
+      "center": [114.315, 34.852],
       "zoom": 10.4,
       "pitch": 30,
       "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
       "params": {
         "id": "newfiber-XYZLayer",
         "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ],
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
         "minZoom": 1,
         "maxZoom": 19,
         "tileType": ""
@@ -51,9 +37,7 @@
       "methods": [
         {
           "name": "addTo",
-          "params": [
-            "''||map"
-          ]
+          "params": ["''||map"]
         },
         {
           "name": "hide",
@@ -67,16 +51,7 @@
       "params": {
         "id": "newfiber-WMTSLayer",
         "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ]
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
       },
       "methods": []
     },
@@ -85,12 +60,7 @@
       "type": "CanvasLayer",
       "params": {
         "id": "newfiber-CanvasLayer",
-        "bbox": [
-          110.98300209463804,
-          32.415967161418266,
-          111.34992583909221,
-          32.599933881244255
-        ],
+        "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
         "width": 3000,
         "height": 1172,
         "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "color",
@@ -165,21 +133,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            4
-          ]
+          "params": [4]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -224,28 +186,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(236,223,25,1.0)"
-          ]
+          "params": ["rgba(236,223,25,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            "size",
-            "''||function(v){return v}"
-          ]
+          "params": ["size", "''||function(v){return v}"]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -269,21 +222,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            3
-          ]
+          "params": [3]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -328,27 +275,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(255,0,0,1.0)"
-          ]
+          "params": ["rgba(255,0,0,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            10
-          ]
+          "params": [10]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -372,24 +311,17 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "map_selected"
-          ]
+          "params": ["map_selected"]
         },
         {
           "name": "size",
-          "params": [
-            30
-          ]
+          "params": [30]
         },
         {
           "name": "style",
           "params": [
             {
-              "offsets": [
-                0,
-                0
-              ]
+              "offsets": [0, 0]
             }
           ]
         }
@@ -406,21 +338,15 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "size",
-          "params": [
-            2
-          ]
+          "params": [2]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(189, 209, 150,1)"
-          ]
+          "params": ["rgba(189, 209, 150,1)"]
         }
       ]
     }
@@ -445,26 +371,9 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "line",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
-        "line-color": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "#1b76ff",
-          "ws",
-          "#ff4c61",
-          "hs",
-          "#ff80ec",
-          "#000000"
-        ],
+        "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"],
         "line-width": 4
       },
       "layout": {},
@@ -478,27 +387,15 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "layout": {
-        "text-field": [
-          "get",
-          "管径"
-        ],
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-field": ["get", "管径"],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": 15,
         "text-transform": "uppercase",
         "symbol-placement": "line",
-        "text-offset": [
-          0,
-          -0.5
-        ],
+        "text-offset": [0, 1.5],
         "text-allow-overlap": true,
         "text-letter-spacing": 1.1
       },
@@ -518,10 +415,7 @@
       "paint": {
         "fill-color": [
           "match",
-          [
-            "get",
-            "dlmc"
-          ],
+          ["get", "dlmc"],
           "水浇地",
           "#fbe5ab",
           "果园",
@@ -614,16 +508,9 @@
       "key": "hubei_xiaogan_hm_city_boundary",
       "source-layer": "hubei_xiaogan_hm_city_boundary",
       "type": "fill",
-      "filter": [
-        "in",
-        "name",
-        ""
-      ],
+      "filter": ["in", "name", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ]
+        "fill-color": ["get", "fill_color"]
       },
       "layout": {},
       "minzoom": 10,
@@ -636,16 +523,9 @@
       "key": "hubei_xiaogan_hm_psfq",
       "source-layer": "hubei_xiaogan_hm_psfq",
       "type": "fill",
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ],
+        "fill-color": ["get", "fill_color"],
         "fill-opacity": 0.4
       },
       "layout": {},
@@ -659,36 +539,17 @@
       "key": "hn_kf_hm_pipeline_point",
       "source-layer": "hn_kf_hm_pipeline_point",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
         "text-halo-width": 2
       },
       "layout": {
-        "icon-image": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "ysj",
-          "ws",
-          "wsj",
-          "hs",
-          "hsj",
-          "ysbz"
-        ],
+        "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
         "icon-size": 0.5,
         "text-field": "{管线点号}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 13,
         "text-line-height": 3,
         "text-anchor": "top"
@@ -704,11 +565,7 @@
       "type": "symbol",
       "minzoom": 0,
       "maxzoom": 24,
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
@@ -717,10 +574,7 @@
       "layout": {
         "icon-image": [
           "match",
-          [
-            "get",
-            "type"
-          ],
+          ["get", "type"],
           "YSBZ",
           "rainBengZhan_icon",
           "WSBZ",
@@ -750,207 +604,86 @@
         "icon-anchor": "center",
         "icon-size": 0.8,
         "text-field": "{name}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 15,
         "text-line-height": 3,
         "text-anchor": "bottom",
         "text-max-width": 50,
-        "text-offset": [
-          0,
-          3
-        ]
+        "text-offset": [0, 3]
       },
       "mType": "geojson"
     }
   ],
   "orders": [
-    [
-      "newfiber-XYZLayer"
-    ],
-    [
-      "hubei_xiaogan_hm_psfq"
-    ],
-    [
-      "city_boundary"
-    ],
-    [
-      "all_boundary"
-    ],
-    [
-      "pipeline_info"
-    ],
-    [
-      "pipeline_point"
-    ],
-    [
-      "pipeLineLabel"
-    ],
-    [
-      "poi_label"
-    ],
-    [
-      "place_label_city"
-    ],
-    [
-      "road_major_label"
-    ],
-    [
-      "place_label_other"
-    ],
-    [
-      "point"
-    ]
+    ["newfiber-XYZLayer"],
+    ["hubei_xiaogan_hm_psfq"],
+    ["city_boundary"],
+    ["all_boundary"],
+    ["pipeline_info"],
+    ["pipeline_point"],
+    ["pipeLineLabel"],
+    ["poi_label"],
+    ["place_label_city"],
+    ["road_major_label"],
+    ["place_label_other"],
+    ["point"]
   ],
   "filter": {
     "wsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ws"], ["ws"], ["ws"]]
     },
     "hsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["hs"], ["hs"], ["hs"]]
     },
     "ysLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ys"], ["ys"], ["ys"]]
     },
     "YSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "YS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["YS"]]
     },
     "WSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "WS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["WS"]]
     },
     "oldCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["老城区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.926
-        ],
+        "center": [113.933, 30.926],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "southCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "南城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["南城新区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.886
-        ],
+        "center": [113.933, 30.886],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "newCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区"]],
       "easeTo": {
-        "center": [
-          113.983,
-          30.896
-        ],
+        "center": [113.983, 30.896],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "allCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区",
-          "南城新区",
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区", "南城新区", "老城区"]],
       "easeTo": {
-        "center": [
-          113.953,
-          30.906
-        ],
+        "center": [113.953, 30.906],
         "zoom": 13.6,
         "pitch": 55
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/newImgs/pumpGY/dxxmBg.jpg b/src/assets/newImgs/pumpGY/dxxmBg.jpg
new file mode 100644
index 0000000..1c2a625
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/dxxmBg.jpg
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/titleBg.png b/src/assets/newImgs/pumpGY/titleBg.png
new file mode 100644
index 0000000..08d95b0
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/titleBg.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/waterFlow.png b/src/assets/newImgs/pumpGY/waterFlow.png
new file mode 100644
index 0000000..3813537
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/waterFlow.png
Binary files differ
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index d95fc38..416cb42 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -64,7 +64,7 @@
     </el-dialog>
 
     <!-- 下垫面统计的图例说明 -->
-    <div class="landAreaC" v-if="menuIndex == 1">
+    <div class="landAreaC" v-if="menuIndex == 1 && showLandXDM">
       <div class="cont flex" v-for="(item, index) in landArr" :key="index">
         <span :style="{ background: item.color }"></span>
         <div class="title">{{ item.title }}</div>
@@ -118,10 +118,16 @@
 
     <!-- 降雨效果 -->
     <CanvasRain v-if="showRainFlow"></CanvasRain>
+
+    <!-- 典型项目效果 -->
+    <el-dialog v-model="showProjectDX" title="典型项目分析" style="width: 1430px" append-to-body>
+      <ProjectDX></ProjectDX>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import ProjectDX from '@/views/sponeScreen/projectHM/projectDX.vue'; //典型项目分析
 import ProjectArea from '@/views/sponeScreen/projectHM/projectArea.vue'; //分区建议
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
@@ -158,6 +164,8 @@
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
+const showLandXDM = ref(false); //下垫面控制
+const showProjectDX = ref(false);
 const areaObj = ref({ value: '0' });
 // 下垫面统计
 const landArr = ref([
@@ -266,10 +274,20 @@
       showRainFlow.value = true;
     }
   });
+  // 下垫面图例控制
+  bus.on('checkLandXDM', params => {
+    showLandXDM.value = params;
+  });
+  // 典型项目分析
+  bus.on('checkProjectDX', params => {
+    showProjectDX.value = true;
+  });
 });
 onBeforeUnmount(() => {
   bus.off('checkProjectArea');
   bus.off('checkRainL');
+  bus.off('checkLandXDM');
+  bus.off('checkProjectDX');
   if (!newfiberMap) return;
   if (newfiberMap) {
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;

diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 6ca769f..ddc74d0 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
   "params": {
     "basemap": "https://supermap2.wh-nf.cn:8090/bm",
     "mvt": "https://supermap0.wh-nf.cn:8090/vt",
-    "sprites": [
-      "/static/libs/mapbox/style/sprite/sprite5"
-    ],
+    "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
     "init": {
-      "center": [
-        114.315,
-        34.852
-      ],
+      "center": [114.315, 34.852],
       "zoom": 10.4,
       "pitch": 30,
       "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
       "params": {
         "id": "newfiber-XYZLayer",
         "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ],
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
         "minZoom": 1,
         "maxZoom": 19,
         "tileType": ""
@@ -51,9 +37,7 @@
       "methods": [
         {
           "name": "addTo",
-          "params": [
-            "''||map"
-          ]
+          "params": ["''||map"]
         },
         {
           "name": "hide",
@@ -67,16 +51,7 @@
       "params": {
         "id": "newfiber-WMTSLayer",
         "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ]
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
       },
       "methods": []
     },
@@ -85,12 +60,7 @@
       "type": "CanvasLayer",
       "params": {
         "id": "newfiber-CanvasLayer",
-        "bbox": [
-          110.98300209463804,
-          32.415967161418266,
-          111.34992583909221,
-          32.599933881244255
-        ],
+        "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
         "width": 3000,
         "height": 1172,
         "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "color",
@@ -165,21 +133,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            4
-          ]
+          "params": [4]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -224,28 +186,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(236,223,25,1.0)"
-          ]
+          "params": ["rgba(236,223,25,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            "size",
-            "''||function(v){return v}"
-          ]
+          "params": ["size", "''||function(v){return v}"]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -269,21 +222,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            3
-          ]
+          "params": [3]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -328,27 +275,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(255,0,0,1.0)"
-          ]
+          "params": ["rgba(255,0,0,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            10
-          ]
+          "params": [10]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -372,24 +311,17 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "map_selected"
-          ]
+          "params": ["map_selected"]
         },
         {
           "name": "size",
-          "params": [
-            30
-          ]
+          "params": [30]
         },
         {
           "name": "style",
           "params": [
             {
-              "offsets": [
-                0,
-                0
-              ]
+              "offsets": [0, 0]
             }
           ]
         }
@@ -406,21 +338,15 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "size",
-          "params": [
-            2
-          ]
+          "params": [2]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(189, 209, 150,1)"
-          ]
+          "params": ["rgba(189, 209, 150,1)"]
         }
       ]
     }
@@ -445,26 +371,9 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "line",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
-        "line-color": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "#1b76ff",
-          "ws",
-          "#ff4c61",
-          "hs",
-          "#ff80ec",
-          "#000000"
-        ],
+        "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"],
         "line-width": 4
       },
       "layout": {},
@@ -478,27 +387,15 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "layout": {
-        "text-field": [
-          "get",
-          "管径"
-        ],
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-field": ["get", "管径"],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": 15,
         "text-transform": "uppercase",
         "symbol-placement": "line",
-        "text-offset": [
-          0,
-          -0.5
-        ],
+        "text-offset": [0, 1.5],
         "text-allow-overlap": true,
         "text-letter-spacing": 1.1
       },
@@ -518,10 +415,7 @@
       "paint": {
         "fill-color": [
           "match",
-          [
-            "get",
-            "dlmc"
-          ],
+          ["get", "dlmc"],
           "水浇地",
           "#fbe5ab",
           "果园",
@@ -614,16 +508,9 @@
       "key": "hubei_xiaogan_hm_city_boundary",
       "source-layer": "hubei_xiaogan_hm_city_boundary",
       "type": "fill",
-      "filter": [
-        "in",
-        "name",
-        ""
-      ],
+      "filter": ["in", "name", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ]
+        "fill-color": ["get", "fill_color"]
       },
       "layout": {},
       "minzoom": 10,
@@ -636,16 +523,9 @@
       "key": "hubei_xiaogan_hm_psfq",
       "source-layer": "hubei_xiaogan_hm_psfq",
       "type": "fill",
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ],
+        "fill-color": ["get", "fill_color"],
         "fill-opacity": 0.4
       },
       "layout": {},
@@ -659,36 +539,17 @@
       "key": "hn_kf_hm_pipeline_point",
       "source-layer": "hn_kf_hm_pipeline_point",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
         "text-halo-width": 2
       },
       "layout": {
-        "icon-image": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "ysj",
-          "ws",
-          "wsj",
-          "hs",
-          "hsj",
-          "ysbz"
-        ],
+        "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
         "icon-size": 0.5,
         "text-field": "{管线点号}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 13,
         "text-line-height": 3,
         "text-anchor": "top"
@@ -704,11 +565,7 @@
       "type": "symbol",
       "minzoom": 0,
       "maxzoom": 24,
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
@@ -717,10 +574,7 @@
       "layout": {
         "icon-image": [
           "match",
-          [
-            "get",
-            "type"
-          ],
+          ["get", "type"],
           "YSBZ",
           "rainBengZhan_icon",
           "WSBZ",
@@ -750,207 +604,86 @@
         "icon-anchor": "center",
         "icon-size": 0.8,
         "text-field": "{name}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 15,
         "text-line-height": 3,
         "text-anchor": "bottom",
         "text-max-width": 50,
-        "text-offset": [
-          0,
-          3
-        ]
+        "text-offset": [0, 3]
       },
       "mType": "geojson"
     }
   ],
   "orders": [
-    [
-      "newfiber-XYZLayer"
-    ],
-    [
-      "hubei_xiaogan_hm_psfq"
-    ],
-    [
-      "city_boundary"
-    ],
-    [
-      "all_boundary"
-    ],
-    [
-      "pipeline_info"
-    ],
-    [
-      "pipeline_point"
-    ],
-    [
-      "pipeLineLabel"
-    ],
-    [
-      "poi_label"
-    ],
-    [
-      "place_label_city"
-    ],
-    [
-      "road_major_label"
-    ],
-    [
-      "place_label_other"
-    ],
-    [
-      "point"
-    ]
+    ["newfiber-XYZLayer"],
+    ["hubei_xiaogan_hm_psfq"],
+    ["city_boundary"],
+    ["all_boundary"],
+    ["pipeline_info"],
+    ["pipeline_point"],
+    ["pipeLineLabel"],
+    ["poi_label"],
+    ["place_label_city"],
+    ["road_major_label"],
+    ["place_label_other"],
+    ["point"]
   ],
   "filter": {
     "wsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ws"], ["ws"], ["ws"]]
     },
     "hsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["hs"], ["hs"], ["hs"]]
     },
     "ysLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ys"], ["ys"], ["ys"]]
     },
     "YSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "YS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["YS"]]
     },
     "WSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "WS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["WS"]]
     },
     "oldCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["老城区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.926
-        ],
+        "center": [113.933, 30.926],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "southCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "南城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["南城新区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.886
-        ],
+        "center": [113.933, 30.886],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "newCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区"]],
       "easeTo": {
-        "center": [
-          113.983,
-          30.896
-        ],
+        "center": [113.983, 30.896],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "allCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区",
-          "南城新区",
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区", "南城新区", "老城区"]],
       "easeTo": {
-        "center": [
-          113.953,
-          30.906
-        ],
+        "center": [113.953, 30.906],
         "zoom": 13.6,
         "pitch": 55
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/newImgs/pumpGY/dxxmBg.jpg b/src/assets/newImgs/pumpGY/dxxmBg.jpg
new file mode 100644
index 0000000..1c2a625
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/dxxmBg.jpg
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/titleBg.png b/src/assets/newImgs/pumpGY/titleBg.png
new file mode 100644
index 0000000..08d95b0
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/titleBg.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/waterFlow.png b/src/assets/newImgs/pumpGY/waterFlow.png
new file mode 100644
index 0000000..3813537
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/waterFlow.png
Binary files differ
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index d95fc38..416cb42 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -64,7 +64,7 @@
     </el-dialog>
 
     <!-- 下垫面统计的图例说明 -->
-    <div class="landAreaC" v-if="menuIndex == 1">
+    <div class="landAreaC" v-if="menuIndex == 1 && showLandXDM">
       <div class="cont flex" v-for="(item, index) in landArr" :key="index">
         <span :style="{ background: item.color }"></span>
         <div class="title">{{ item.title }}</div>
@@ -118,10 +118,16 @@
 
     <!-- 降雨效果 -->
     <CanvasRain v-if="showRainFlow"></CanvasRain>
+
+    <!-- 典型项目效果 -->
+    <el-dialog v-model="showProjectDX" title="典型项目分析" style="width: 1430px" append-to-body>
+      <ProjectDX></ProjectDX>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import ProjectDX from '@/views/sponeScreen/projectHM/projectDX.vue'; //典型项目分析
 import ProjectArea from '@/views/sponeScreen/projectHM/projectArea.vue'; //分区建议
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
@@ -158,6 +164,8 @@
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
+const showLandXDM = ref(false); //下垫面控制
+const showProjectDX = ref(false);
 const areaObj = ref({ value: '0' });
 // 下垫面统计
 const landArr = ref([
@@ -266,10 +274,20 @@
       showRainFlow.value = true;
     }
   });
+  // 下垫面图例控制
+  bus.on('checkLandXDM', params => {
+    showLandXDM.value = params;
+  });
+  // 典型项目分析
+  bus.on('checkProjectDX', params => {
+    showProjectDX.value = true;
+  });
 });
 onBeforeUnmount(() => {
   bus.off('checkProjectArea');
   bus.off('checkRainL');
+  bus.off('checkLandXDM');
+  bus.off('checkProjectDX');
   if (!newfiberMap) return;
   if (newfiberMap) {
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 1be38b4..57090b1 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -81,6 +81,7 @@
   },
 ]);
 const showTotalArea = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -120,6 +121,7 @@
   });
 };
 const showCenterCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -159,6 +161,7 @@
   });
 };
 const showBuiltCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -206,6 +209,7 @@
   // });
 };
 const showOneCenterLayer = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -242,6 +246,7 @@
   });
 };
 const setLayerVisible = () => {
+  bus.emit('checkLandXDM', true);
   // wmsVisibility.value = !wmsVisibility.value;
   newfiberMapBoxVectorLayer.removeByIds([
     'oneCenter',

diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 6ca769f..ddc74d0 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
   "params": {
     "basemap": "https://supermap2.wh-nf.cn:8090/bm",
     "mvt": "https://supermap0.wh-nf.cn:8090/vt",
-    "sprites": [
-      "/static/libs/mapbox/style/sprite/sprite5"
-    ],
+    "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
     "init": {
-      "center": [
-        114.315,
-        34.852
-      ],
+      "center": [114.315, 34.852],
       "zoom": 10.4,
       "pitch": 30,
       "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
       "params": {
         "id": "newfiber-XYZLayer",
         "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ],
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
         "minZoom": 1,
         "maxZoom": 19,
         "tileType": ""
@@ -51,9 +37,7 @@
       "methods": [
         {
           "name": "addTo",
-          "params": [
-            "''||map"
-          ]
+          "params": ["''||map"]
         },
         {
           "name": "hide",
@@ -67,16 +51,7 @@
       "params": {
         "id": "newfiber-WMTSLayer",
         "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ]
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
       },
       "methods": []
     },
@@ -85,12 +60,7 @@
       "type": "CanvasLayer",
       "params": {
         "id": "newfiber-CanvasLayer",
-        "bbox": [
-          110.98300209463804,
-          32.415967161418266,
-          111.34992583909221,
-          32.599933881244255
-        ],
+        "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
         "width": 3000,
         "height": 1172,
         "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "color",
@@ -165,21 +133,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            4
-          ]
+          "params": [4]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -224,28 +186,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(236,223,25,1.0)"
-          ]
+          "params": ["rgba(236,223,25,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            "size",
-            "''||function(v){return v}"
-          ]
+          "params": ["size", "''||function(v){return v}"]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -269,21 +222,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            3
-          ]
+          "params": [3]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -328,27 +275,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(255,0,0,1.0)"
-          ]
+          "params": ["rgba(255,0,0,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            10
-          ]
+          "params": [10]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -372,24 +311,17 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "map_selected"
-          ]
+          "params": ["map_selected"]
         },
         {
           "name": "size",
-          "params": [
-            30
-          ]
+          "params": [30]
         },
         {
           "name": "style",
           "params": [
             {
-              "offsets": [
-                0,
-                0
-              ]
+              "offsets": [0, 0]
             }
           ]
         }
@@ -406,21 +338,15 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "size",
-          "params": [
-            2
-          ]
+          "params": [2]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(189, 209, 150,1)"
-          ]
+          "params": ["rgba(189, 209, 150,1)"]
         }
       ]
     }
@@ -445,26 +371,9 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "line",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
-        "line-color": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "#1b76ff",
-          "ws",
-          "#ff4c61",
-          "hs",
-          "#ff80ec",
-          "#000000"
-        ],
+        "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"],
         "line-width": 4
       },
       "layout": {},
@@ -478,27 +387,15 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "layout": {
-        "text-field": [
-          "get",
-          "管径"
-        ],
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-field": ["get", "管径"],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": 15,
         "text-transform": "uppercase",
         "symbol-placement": "line",
-        "text-offset": [
-          0,
-          -0.5
-        ],
+        "text-offset": [0, 1.5],
         "text-allow-overlap": true,
         "text-letter-spacing": 1.1
       },
@@ -518,10 +415,7 @@
       "paint": {
         "fill-color": [
           "match",
-          [
-            "get",
-            "dlmc"
-          ],
+          ["get", "dlmc"],
           "水浇地",
           "#fbe5ab",
           "果园",
@@ -614,16 +508,9 @@
       "key": "hubei_xiaogan_hm_city_boundary",
       "source-layer": "hubei_xiaogan_hm_city_boundary",
       "type": "fill",
-      "filter": [
-        "in",
-        "name",
-        ""
-      ],
+      "filter": ["in", "name", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ]
+        "fill-color": ["get", "fill_color"]
       },
       "layout": {},
       "minzoom": 10,
@@ -636,16 +523,9 @@
       "key": "hubei_xiaogan_hm_psfq",
       "source-layer": "hubei_xiaogan_hm_psfq",
       "type": "fill",
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ],
+        "fill-color": ["get", "fill_color"],
         "fill-opacity": 0.4
       },
       "layout": {},
@@ -659,36 +539,17 @@
       "key": "hn_kf_hm_pipeline_point",
       "source-layer": "hn_kf_hm_pipeline_point",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
         "text-halo-width": 2
       },
       "layout": {
-        "icon-image": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "ysj",
-          "ws",
-          "wsj",
-          "hs",
-          "hsj",
-          "ysbz"
-        ],
+        "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
         "icon-size": 0.5,
         "text-field": "{管线点号}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 13,
         "text-line-height": 3,
         "text-anchor": "top"
@@ -704,11 +565,7 @@
       "type": "symbol",
       "minzoom": 0,
       "maxzoom": 24,
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
@@ -717,10 +574,7 @@
       "layout": {
         "icon-image": [
           "match",
-          [
-            "get",
-            "type"
-          ],
+          ["get", "type"],
           "YSBZ",
           "rainBengZhan_icon",
           "WSBZ",
@@ -750,207 +604,86 @@
         "icon-anchor": "center",
         "icon-size": 0.8,
         "text-field": "{name}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 15,
         "text-line-height": 3,
         "text-anchor": "bottom",
         "text-max-width": 50,
-        "text-offset": [
-          0,
-          3
-        ]
+        "text-offset": [0, 3]
       },
       "mType": "geojson"
     }
   ],
   "orders": [
-    [
-      "newfiber-XYZLayer"
-    ],
-    [
-      "hubei_xiaogan_hm_psfq"
-    ],
-    [
-      "city_boundary"
-    ],
-    [
-      "all_boundary"
-    ],
-    [
-      "pipeline_info"
-    ],
-    [
-      "pipeline_point"
-    ],
-    [
-      "pipeLineLabel"
-    ],
-    [
-      "poi_label"
-    ],
-    [
-      "place_label_city"
-    ],
-    [
-      "road_major_label"
-    ],
-    [
-      "place_label_other"
-    ],
-    [
-      "point"
-    ]
+    ["newfiber-XYZLayer"],
+    ["hubei_xiaogan_hm_psfq"],
+    ["city_boundary"],
+    ["all_boundary"],
+    ["pipeline_info"],
+    ["pipeline_point"],
+    ["pipeLineLabel"],
+    ["poi_label"],
+    ["place_label_city"],
+    ["road_major_label"],
+    ["place_label_other"],
+    ["point"]
   ],
   "filter": {
     "wsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ws"], ["ws"], ["ws"]]
     },
     "hsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["hs"], ["hs"], ["hs"]]
     },
     "ysLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ys"], ["ys"], ["ys"]]
     },
     "YSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "YS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["YS"]]
     },
     "WSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "WS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["WS"]]
     },
     "oldCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["老城区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.926
-        ],
+        "center": [113.933, 30.926],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "southCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "南城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["南城新区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.886
-        ],
+        "center": [113.933, 30.886],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "newCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区"]],
       "easeTo": {
-        "center": [
-          113.983,
-          30.896
-        ],
+        "center": [113.983, 30.896],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "allCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区",
-          "南城新区",
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区", "南城新区", "老城区"]],
       "easeTo": {
-        "center": [
-          113.953,
-          30.906
-        ],
+        "center": [113.953, 30.906],
         "zoom": 13.6,
         "pitch": 55
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/newImgs/pumpGY/dxxmBg.jpg b/src/assets/newImgs/pumpGY/dxxmBg.jpg
new file mode 100644
index 0000000..1c2a625
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/dxxmBg.jpg
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/titleBg.png b/src/assets/newImgs/pumpGY/titleBg.png
new file mode 100644
index 0000000..08d95b0
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/titleBg.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/waterFlow.png b/src/assets/newImgs/pumpGY/waterFlow.png
new file mode 100644
index 0000000..3813537
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/waterFlow.png
Binary files differ
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index d95fc38..416cb42 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -64,7 +64,7 @@
     </el-dialog>
 
     <!-- 下垫面统计的图例说明 -->
-    <div class="landAreaC" v-if="menuIndex == 1">
+    <div class="landAreaC" v-if="menuIndex == 1 && showLandXDM">
       <div class="cont flex" v-for="(item, index) in landArr" :key="index">
         <span :style="{ background: item.color }"></span>
         <div class="title">{{ item.title }}</div>
@@ -118,10 +118,16 @@
 
     <!-- 降雨效果 -->
     <CanvasRain v-if="showRainFlow"></CanvasRain>
+
+    <!-- 典型项目效果 -->
+    <el-dialog v-model="showProjectDX" title="典型项目分析" style="width: 1430px" append-to-body>
+      <ProjectDX></ProjectDX>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import ProjectDX from '@/views/sponeScreen/projectHM/projectDX.vue'; //典型项目分析
 import ProjectArea from '@/views/sponeScreen/projectHM/projectArea.vue'; //分区建议
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
@@ -158,6 +164,8 @@
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
+const showLandXDM = ref(false); //下垫面控制
+const showProjectDX = ref(false);
 const areaObj = ref({ value: '0' });
 // 下垫面统计
 const landArr = ref([
@@ -266,10 +274,20 @@
       showRainFlow.value = true;
     }
   });
+  // 下垫面图例控制
+  bus.on('checkLandXDM', params => {
+    showLandXDM.value = params;
+  });
+  // 典型项目分析
+  bus.on('checkProjectDX', params => {
+    showProjectDX.value = true;
+  });
 });
 onBeforeUnmount(() => {
   bus.off('checkProjectArea');
   bus.off('checkRainL');
+  bus.off('checkLandXDM');
+  bus.off('checkProjectDX');
   if (!newfiberMap) return;
   if (newfiberMap) {
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 1be38b4..57090b1 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -81,6 +81,7 @@
   },
 ]);
 const showTotalArea = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -120,6 +121,7 @@
   });
 };
 const showCenterCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -159,6 +161,7 @@
   });
 };
 const showBuiltCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -206,6 +209,7 @@
   // });
 };
 const showOneCenterLayer = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -242,6 +246,7 @@
   });
 };
 const setLayerVisible = () => {
+  bus.emit('checkLandXDM', true);
   // wmsVisibility.value = !wmsVisibility.value;
   newfiberMapBoxVectorLayer.removeByIds([
     'oneCenter',
diff --git a/src/views/sponeScreen/cityGK/canvasRain.vue b/src/views/sponeScreen/cityGK/canvasRain.vue
index 415c5f3..51730f9 100644
--- a/src/views/sponeScreen/cityGK/canvasRain.vue
+++ b/src/views/sponeScreen/cityGK/canvasRain.vue
@@ -61,7 +61,7 @@
       arr[i].show();
       arr[i].run();
     }
-  }, 10);
+  }, 30);
 }
 // 初始化
 function init(ctx1) {

diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 6ca769f..ddc74d0 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
   "params": {
     "basemap": "https://supermap2.wh-nf.cn:8090/bm",
     "mvt": "https://supermap0.wh-nf.cn:8090/vt",
-    "sprites": [
-      "/static/libs/mapbox/style/sprite/sprite5"
-    ],
+    "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
     "init": {
-      "center": [
-        114.315,
-        34.852
-      ],
+      "center": [114.315, 34.852],
       "zoom": 10.4,
       "pitch": 30,
       "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
       "params": {
         "id": "newfiber-XYZLayer",
         "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ],
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
         "minZoom": 1,
         "maxZoom": 19,
         "tileType": ""
@@ -51,9 +37,7 @@
       "methods": [
         {
           "name": "addTo",
-          "params": [
-            "''||map"
-          ]
+          "params": ["''||map"]
         },
         {
           "name": "hide",
@@ -67,16 +51,7 @@
       "params": {
         "id": "newfiber-WMTSLayer",
         "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ]
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
       },
       "methods": []
     },
@@ -85,12 +60,7 @@
       "type": "CanvasLayer",
       "params": {
         "id": "newfiber-CanvasLayer",
-        "bbox": [
-          110.98300209463804,
-          32.415967161418266,
-          111.34992583909221,
-          32.599933881244255
-        ],
+        "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
         "width": 3000,
         "height": 1172,
         "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "color",
@@ -165,21 +133,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            4
-          ]
+          "params": [4]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -224,28 +186,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(236,223,25,1.0)"
-          ]
+          "params": ["rgba(236,223,25,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            "size",
-            "''||function(v){return v}"
-          ]
+          "params": ["size", "''||function(v){return v}"]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -269,21 +222,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            3
-          ]
+          "params": [3]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -328,27 +275,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(255,0,0,1.0)"
-          ]
+          "params": ["rgba(255,0,0,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            10
-          ]
+          "params": [10]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -372,24 +311,17 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "map_selected"
-          ]
+          "params": ["map_selected"]
         },
         {
           "name": "size",
-          "params": [
-            30
-          ]
+          "params": [30]
         },
         {
           "name": "style",
           "params": [
             {
-              "offsets": [
-                0,
-                0
-              ]
+              "offsets": [0, 0]
             }
           ]
         }
@@ -406,21 +338,15 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "size",
-          "params": [
-            2
-          ]
+          "params": [2]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(189, 209, 150,1)"
-          ]
+          "params": ["rgba(189, 209, 150,1)"]
         }
       ]
     }
@@ -445,26 +371,9 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "line",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
-        "line-color": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "#1b76ff",
-          "ws",
-          "#ff4c61",
-          "hs",
-          "#ff80ec",
-          "#000000"
-        ],
+        "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"],
         "line-width": 4
       },
       "layout": {},
@@ -478,27 +387,15 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "layout": {
-        "text-field": [
-          "get",
-          "管径"
-        ],
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-field": ["get", "管径"],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": 15,
         "text-transform": "uppercase",
         "symbol-placement": "line",
-        "text-offset": [
-          0,
-          -0.5
-        ],
+        "text-offset": [0, 1.5],
         "text-allow-overlap": true,
         "text-letter-spacing": 1.1
       },
@@ -518,10 +415,7 @@
       "paint": {
         "fill-color": [
           "match",
-          [
-            "get",
-            "dlmc"
-          ],
+          ["get", "dlmc"],
           "水浇地",
           "#fbe5ab",
           "果园",
@@ -614,16 +508,9 @@
       "key": "hubei_xiaogan_hm_city_boundary",
       "source-layer": "hubei_xiaogan_hm_city_boundary",
       "type": "fill",
-      "filter": [
-        "in",
-        "name",
-        ""
-      ],
+      "filter": ["in", "name", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ]
+        "fill-color": ["get", "fill_color"]
       },
       "layout": {},
       "minzoom": 10,
@@ -636,16 +523,9 @@
       "key": "hubei_xiaogan_hm_psfq",
       "source-layer": "hubei_xiaogan_hm_psfq",
       "type": "fill",
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ],
+        "fill-color": ["get", "fill_color"],
         "fill-opacity": 0.4
       },
       "layout": {},
@@ -659,36 +539,17 @@
       "key": "hn_kf_hm_pipeline_point",
       "source-layer": "hn_kf_hm_pipeline_point",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
         "text-halo-width": 2
       },
       "layout": {
-        "icon-image": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "ysj",
-          "ws",
-          "wsj",
-          "hs",
-          "hsj",
-          "ysbz"
-        ],
+        "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
         "icon-size": 0.5,
         "text-field": "{管线点号}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 13,
         "text-line-height": 3,
         "text-anchor": "top"
@@ -704,11 +565,7 @@
       "type": "symbol",
       "minzoom": 0,
       "maxzoom": 24,
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
@@ -717,10 +574,7 @@
       "layout": {
         "icon-image": [
           "match",
-          [
-            "get",
-            "type"
-          ],
+          ["get", "type"],
           "YSBZ",
           "rainBengZhan_icon",
           "WSBZ",
@@ -750,207 +604,86 @@
         "icon-anchor": "center",
         "icon-size": 0.8,
         "text-field": "{name}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 15,
         "text-line-height": 3,
         "text-anchor": "bottom",
         "text-max-width": 50,
-        "text-offset": [
-          0,
-          3
-        ]
+        "text-offset": [0, 3]
       },
       "mType": "geojson"
     }
   ],
   "orders": [
-    [
-      "newfiber-XYZLayer"
-    ],
-    [
-      "hubei_xiaogan_hm_psfq"
-    ],
-    [
-      "city_boundary"
-    ],
-    [
-      "all_boundary"
-    ],
-    [
-      "pipeline_info"
-    ],
-    [
-      "pipeline_point"
-    ],
-    [
-      "pipeLineLabel"
-    ],
-    [
-      "poi_label"
-    ],
-    [
-      "place_label_city"
-    ],
-    [
-      "road_major_label"
-    ],
-    [
-      "place_label_other"
-    ],
-    [
-      "point"
-    ]
+    ["newfiber-XYZLayer"],
+    ["hubei_xiaogan_hm_psfq"],
+    ["city_boundary"],
+    ["all_boundary"],
+    ["pipeline_info"],
+    ["pipeline_point"],
+    ["pipeLineLabel"],
+    ["poi_label"],
+    ["place_label_city"],
+    ["road_major_label"],
+    ["place_label_other"],
+    ["point"]
   ],
   "filter": {
     "wsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ws"], ["ws"], ["ws"]]
     },
     "hsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["hs"], ["hs"], ["hs"]]
     },
     "ysLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ys"], ["ys"], ["ys"]]
     },
     "YSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "YS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["YS"]]
     },
     "WSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "WS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["WS"]]
     },
     "oldCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["老城区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.926
-        ],
+        "center": [113.933, 30.926],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "southCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "南城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["南城新区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.886
-        ],
+        "center": [113.933, 30.886],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "newCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区"]],
       "easeTo": {
-        "center": [
-          113.983,
-          30.896
-        ],
+        "center": [113.983, 30.896],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "allCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区",
-          "南城新区",
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区", "南城新区", "老城区"]],
       "easeTo": {
-        "center": [
-          113.953,
-          30.906
-        ],
+        "center": [113.953, 30.906],
         "zoom": 13.6,
         "pitch": 55
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/newImgs/pumpGY/dxxmBg.jpg b/src/assets/newImgs/pumpGY/dxxmBg.jpg
new file mode 100644
index 0000000..1c2a625
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/dxxmBg.jpg
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/titleBg.png b/src/assets/newImgs/pumpGY/titleBg.png
new file mode 100644
index 0000000..08d95b0
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/titleBg.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/waterFlow.png b/src/assets/newImgs/pumpGY/waterFlow.png
new file mode 100644
index 0000000..3813537
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/waterFlow.png
Binary files differ
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index d95fc38..416cb42 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -64,7 +64,7 @@
     </el-dialog>
 
     <!-- 下垫面统计的图例说明 -->
-    <div class="landAreaC" v-if="menuIndex == 1">
+    <div class="landAreaC" v-if="menuIndex == 1 && showLandXDM">
       <div class="cont flex" v-for="(item, index) in landArr" :key="index">
         <span :style="{ background: item.color }"></span>
         <div class="title">{{ item.title }}</div>
@@ -118,10 +118,16 @@
 
     <!-- 降雨效果 -->
     <CanvasRain v-if="showRainFlow"></CanvasRain>
+
+    <!-- 典型项目效果 -->
+    <el-dialog v-model="showProjectDX" title="典型项目分析" style="width: 1430px" append-to-body>
+      <ProjectDX></ProjectDX>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import ProjectDX from '@/views/sponeScreen/projectHM/projectDX.vue'; //典型项目分析
 import ProjectArea from '@/views/sponeScreen/projectHM/projectArea.vue'; //分区建议
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
@@ -158,6 +164,8 @@
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
+const showLandXDM = ref(false); //下垫面控制
+const showProjectDX = ref(false);
 const areaObj = ref({ value: '0' });
 // 下垫面统计
 const landArr = ref([
@@ -266,10 +274,20 @@
       showRainFlow.value = true;
     }
   });
+  // 下垫面图例控制
+  bus.on('checkLandXDM', params => {
+    showLandXDM.value = params;
+  });
+  // 典型项目分析
+  bus.on('checkProjectDX', params => {
+    showProjectDX.value = true;
+  });
 });
 onBeforeUnmount(() => {
   bus.off('checkProjectArea');
   bus.off('checkRainL');
+  bus.off('checkLandXDM');
+  bus.off('checkProjectDX');
   if (!newfiberMap) return;
   if (newfiberMap) {
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 1be38b4..57090b1 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -81,6 +81,7 @@
   },
 ]);
 const showTotalArea = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -120,6 +121,7 @@
   });
 };
 const showCenterCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -159,6 +161,7 @@
   });
 };
 const showBuiltCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -206,6 +209,7 @@
   // });
 };
 const showOneCenterLayer = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -242,6 +246,7 @@
   });
 };
 const setLayerVisible = () => {
+  bus.emit('checkLandXDM', true);
   // wmsVisibility.value = !wmsVisibility.value;
   newfiberMapBoxVectorLayer.removeByIds([
     'oneCenter',
diff --git a/src/views/sponeScreen/cityGK/canvasRain.vue b/src/views/sponeScreen/cityGK/canvasRain.vue
index 415c5f3..51730f9 100644
--- a/src/views/sponeScreen/cityGK/canvasRain.vue
+++ b/src/views/sponeScreen/cityGK/canvasRain.vue
@@ -61,7 +61,7 @@
       arr[i].show();
       arr[i].run();
     }
-  }, 10);
+  }, 30);
 }
 // 初始化
 function init(ctx1) {
diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue
index d06fe14..ec4bd6d 100644
--- a/src/views/sponeScreen/cityGK/cityplanning.vue
+++ b/src/views/sponeScreen/cityGK/cityplanning.vue
@@ -152,6 +152,7 @@
   },
 ]);
 const showFlowTotalQuantity = () => {
+  bus.emit('checkLandXDM', false);
   let YSFQ2_cope;
 
   //移除一心一核

diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 6ca769f..ddc74d0 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
   "params": {
     "basemap": "https://supermap2.wh-nf.cn:8090/bm",
     "mvt": "https://supermap0.wh-nf.cn:8090/vt",
-    "sprites": [
-      "/static/libs/mapbox/style/sprite/sprite5"
-    ],
+    "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
     "init": {
-      "center": [
-        114.315,
-        34.852
-      ],
+      "center": [114.315, 34.852],
       "zoom": 10.4,
       "pitch": 30,
       "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
       "params": {
         "id": "newfiber-XYZLayer",
         "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ],
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
         "minZoom": 1,
         "maxZoom": 19,
         "tileType": ""
@@ -51,9 +37,7 @@
       "methods": [
         {
           "name": "addTo",
-          "params": [
-            "''||map"
-          ]
+          "params": ["''||map"]
         },
         {
           "name": "hide",
@@ -67,16 +51,7 @@
       "params": {
         "id": "newfiber-WMTSLayer",
         "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ]
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
       },
       "methods": []
     },
@@ -85,12 +60,7 @@
       "type": "CanvasLayer",
       "params": {
         "id": "newfiber-CanvasLayer",
-        "bbox": [
-          110.98300209463804,
-          32.415967161418266,
-          111.34992583909221,
-          32.599933881244255
-        ],
+        "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
         "width": 3000,
         "height": 1172,
         "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "color",
@@ -165,21 +133,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            4
-          ]
+          "params": [4]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -224,28 +186,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(236,223,25,1.0)"
-          ]
+          "params": ["rgba(236,223,25,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            "size",
-            "''||function(v){return v}"
-          ]
+          "params": ["size", "''||function(v){return v}"]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -269,21 +222,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            3
-          ]
+          "params": [3]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -328,27 +275,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(255,0,0,1.0)"
-          ]
+          "params": ["rgba(255,0,0,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            10
-          ]
+          "params": [10]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -372,24 +311,17 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "map_selected"
-          ]
+          "params": ["map_selected"]
         },
         {
           "name": "size",
-          "params": [
-            30
-          ]
+          "params": [30]
         },
         {
           "name": "style",
           "params": [
             {
-              "offsets": [
-                0,
-                0
-              ]
+              "offsets": [0, 0]
             }
           ]
         }
@@ -406,21 +338,15 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "size",
-          "params": [
-            2
-          ]
+          "params": [2]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(189, 209, 150,1)"
-          ]
+          "params": ["rgba(189, 209, 150,1)"]
         }
       ]
     }
@@ -445,26 +371,9 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "line",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
-        "line-color": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "#1b76ff",
-          "ws",
-          "#ff4c61",
-          "hs",
-          "#ff80ec",
-          "#000000"
-        ],
+        "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"],
         "line-width": 4
       },
       "layout": {},
@@ -478,27 +387,15 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "layout": {
-        "text-field": [
-          "get",
-          "管径"
-        ],
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-field": ["get", "管径"],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": 15,
         "text-transform": "uppercase",
         "symbol-placement": "line",
-        "text-offset": [
-          0,
-          -0.5
-        ],
+        "text-offset": [0, 1.5],
         "text-allow-overlap": true,
         "text-letter-spacing": 1.1
       },
@@ -518,10 +415,7 @@
       "paint": {
         "fill-color": [
           "match",
-          [
-            "get",
-            "dlmc"
-          ],
+          ["get", "dlmc"],
           "水浇地",
           "#fbe5ab",
           "果园",
@@ -614,16 +508,9 @@
       "key": "hubei_xiaogan_hm_city_boundary",
       "source-layer": "hubei_xiaogan_hm_city_boundary",
       "type": "fill",
-      "filter": [
-        "in",
-        "name",
-        ""
-      ],
+      "filter": ["in", "name", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ]
+        "fill-color": ["get", "fill_color"]
       },
       "layout": {},
       "minzoom": 10,
@@ -636,16 +523,9 @@
       "key": "hubei_xiaogan_hm_psfq",
       "source-layer": "hubei_xiaogan_hm_psfq",
       "type": "fill",
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ],
+        "fill-color": ["get", "fill_color"],
         "fill-opacity": 0.4
       },
       "layout": {},
@@ -659,36 +539,17 @@
       "key": "hn_kf_hm_pipeline_point",
       "source-layer": "hn_kf_hm_pipeline_point",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
         "text-halo-width": 2
       },
       "layout": {
-        "icon-image": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "ysj",
-          "ws",
-          "wsj",
-          "hs",
-          "hsj",
-          "ysbz"
-        ],
+        "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
         "icon-size": 0.5,
         "text-field": "{管线点号}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 13,
         "text-line-height": 3,
         "text-anchor": "top"
@@ -704,11 +565,7 @@
       "type": "symbol",
       "minzoom": 0,
       "maxzoom": 24,
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
@@ -717,10 +574,7 @@
       "layout": {
         "icon-image": [
           "match",
-          [
-            "get",
-            "type"
-          ],
+          ["get", "type"],
           "YSBZ",
           "rainBengZhan_icon",
           "WSBZ",
@@ -750,207 +604,86 @@
         "icon-anchor": "center",
         "icon-size": 0.8,
         "text-field": "{name}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 15,
         "text-line-height": 3,
         "text-anchor": "bottom",
         "text-max-width": 50,
-        "text-offset": [
-          0,
-          3
-        ]
+        "text-offset": [0, 3]
       },
       "mType": "geojson"
     }
   ],
   "orders": [
-    [
-      "newfiber-XYZLayer"
-    ],
-    [
-      "hubei_xiaogan_hm_psfq"
-    ],
-    [
-      "city_boundary"
-    ],
-    [
-      "all_boundary"
-    ],
-    [
-      "pipeline_info"
-    ],
-    [
-      "pipeline_point"
-    ],
-    [
-      "pipeLineLabel"
-    ],
-    [
-      "poi_label"
-    ],
-    [
-      "place_label_city"
-    ],
-    [
-      "road_major_label"
-    ],
-    [
-      "place_label_other"
-    ],
-    [
-      "point"
-    ]
+    ["newfiber-XYZLayer"],
+    ["hubei_xiaogan_hm_psfq"],
+    ["city_boundary"],
+    ["all_boundary"],
+    ["pipeline_info"],
+    ["pipeline_point"],
+    ["pipeLineLabel"],
+    ["poi_label"],
+    ["place_label_city"],
+    ["road_major_label"],
+    ["place_label_other"],
+    ["point"]
   ],
   "filter": {
     "wsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ws"], ["ws"], ["ws"]]
     },
     "hsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["hs"], ["hs"], ["hs"]]
     },
     "ysLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ys"], ["ys"], ["ys"]]
     },
     "YSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "YS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["YS"]]
     },
     "WSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "WS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["WS"]]
     },
     "oldCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["老城区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.926
-        ],
+        "center": [113.933, 30.926],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "southCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "南城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["南城新区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.886
-        ],
+        "center": [113.933, 30.886],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "newCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区"]],
       "easeTo": {
-        "center": [
-          113.983,
-          30.896
-        ],
+        "center": [113.983, 30.896],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "allCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区",
-          "南城新区",
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区", "南城新区", "老城区"]],
       "easeTo": {
-        "center": [
-          113.953,
-          30.906
-        ],
+        "center": [113.953, 30.906],
         "zoom": 13.6,
         "pitch": 55
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/newImgs/pumpGY/dxxmBg.jpg b/src/assets/newImgs/pumpGY/dxxmBg.jpg
new file mode 100644
index 0000000..1c2a625
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/dxxmBg.jpg
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/titleBg.png b/src/assets/newImgs/pumpGY/titleBg.png
new file mode 100644
index 0000000..08d95b0
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/titleBg.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/waterFlow.png b/src/assets/newImgs/pumpGY/waterFlow.png
new file mode 100644
index 0000000..3813537
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/waterFlow.png
Binary files differ
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index d95fc38..416cb42 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -64,7 +64,7 @@
     </el-dialog>
 
     <!-- 下垫面统计的图例说明 -->
-    <div class="landAreaC" v-if="menuIndex == 1">
+    <div class="landAreaC" v-if="menuIndex == 1 && showLandXDM">
       <div class="cont flex" v-for="(item, index) in landArr" :key="index">
         <span :style="{ background: item.color }"></span>
         <div class="title">{{ item.title }}</div>
@@ -118,10 +118,16 @@
 
     <!-- 降雨效果 -->
     <CanvasRain v-if="showRainFlow"></CanvasRain>
+
+    <!-- 典型项目效果 -->
+    <el-dialog v-model="showProjectDX" title="典型项目分析" style="width: 1430px" append-to-body>
+      <ProjectDX></ProjectDX>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import ProjectDX from '@/views/sponeScreen/projectHM/projectDX.vue'; //典型项目分析
 import ProjectArea from '@/views/sponeScreen/projectHM/projectArea.vue'; //分区建议
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
@@ -158,6 +164,8 @@
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
+const showLandXDM = ref(false); //下垫面控制
+const showProjectDX = ref(false);
 const areaObj = ref({ value: '0' });
 // 下垫面统计
 const landArr = ref([
@@ -266,10 +274,20 @@
       showRainFlow.value = true;
     }
   });
+  // 下垫面图例控制
+  bus.on('checkLandXDM', params => {
+    showLandXDM.value = params;
+  });
+  // 典型项目分析
+  bus.on('checkProjectDX', params => {
+    showProjectDX.value = true;
+  });
 });
 onBeforeUnmount(() => {
   bus.off('checkProjectArea');
   bus.off('checkRainL');
+  bus.off('checkLandXDM');
+  bus.off('checkProjectDX');
   if (!newfiberMap) return;
   if (newfiberMap) {
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 1be38b4..57090b1 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -81,6 +81,7 @@
   },
 ]);
 const showTotalArea = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -120,6 +121,7 @@
   });
 };
 const showCenterCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -159,6 +161,7 @@
   });
 };
 const showBuiltCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -206,6 +209,7 @@
   // });
 };
 const showOneCenterLayer = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -242,6 +246,7 @@
   });
 };
 const setLayerVisible = () => {
+  bus.emit('checkLandXDM', true);
   // wmsVisibility.value = !wmsVisibility.value;
   newfiberMapBoxVectorLayer.removeByIds([
     'oneCenter',
diff --git a/src/views/sponeScreen/cityGK/canvasRain.vue b/src/views/sponeScreen/cityGK/canvasRain.vue
index 415c5f3..51730f9 100644
--- a/src/views/sponeScreen/cityGK/canvasRain.vue
+++ b/src/views/sponeScreen/cityGK/canvasRain.vue
@@ -61,7 +61,7 @@
       arr[i].show();
       arr[i].run();
     }
-  }, 10);
+  }, 30);
 }
 // 初始化
 function init(ctx1) {
diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue
index d06fe14..ec4bd6d 100644
--- a/src/views/sponeScreen/cityGK/cityplanning.vue
+++ b/src/views/sponeScreen/cityGK/cityplanning.vue
@@ -152,6 +152,7 @@
   },
 ]);
 const showFlowTotalQuantity = () => {
+  bus.emit('checkLandXDM', false);
   let YSFQ2_cope;
 
   //移除一心一核
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 2cb1d5d..7bd3977 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -70,6 +70,7 @@
 function yearclick(val) {
   activedname.value = val.name;
   bus.emit('checkRainL', val.value);
+  bus.emit('checkLandXDM', false);
 }
 
 onBeforeUnmount(() => {

diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 6ca769f..ddc74d0 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
   "params": {
     "basemap": "https://supermap2.wh-nf.cn:8090/bm",
     "mvt": "https://supermap0.wh-nf.cn:8090/vt",
-    "sprites": [
-      "/static/libs/mapbox/style/sprite/sprite5"
-    ],
+    "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
     "init": {
-      "center": [
-        114.315,
-        34.852
-      ],
+      "center": [114.315, 34.852],
       "zoom": 10.4,
       "pitch": 30,
       "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
       "params": {
         "id": "newfiber-XYZLayer",
         "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ],
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
         "minZoom": 1,
         "maxZoom": 19,
         "tileType": ""
@@ -51,9 +37,7 @@
       "methods": [
         {
           "name": "addTo",
-          "params": [
-            "''||map"
-          ]
+          "params": ["''||map"]
         },
         {
           "name": "hide",
@@ -67,16 +51,7 @@
       "params": {
         "id": "newfiber-WMTSLayer",
         "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ]
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
       },
       "methods": []
     },
@@ -85,12 +60,7 @@
       "type": "CanvasLayer",
       "params": {
         "id": "newfiber-CanvasLayer",
-        "bbox": [
-          110.98300209463804,
-          32.415967161418266,
-          111.34992583909221,
-          32.599933881244255
-        ],
+        "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
         "width": 3000,
         "height": 1172,
         "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "color",
@@ -165,21 +133,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            4
-          ]
+          "params": [4]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -224,28 +186,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(236,223,25,1.0)"
-          ]
+          "params": ["rgba(236,223,25,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            "size",
-            "''||function(v){return v}"
-          ]
+          "params": ["size", "''||function(v){return v}"]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -269,21 +222,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            3
-          ]
+          "params": [3]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -328,27 +275,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(255,0,0,1.0)"
-          ]
+          "params": ["rgba(255,0,0,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            10
-          ]
+          "params": [10]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -372,24 +311,17 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "map_selected"
-          ]
+          "params": ["map_selected"]
         },
         {
           "name": "size",
-          "params": [
-            30
-          ]
+          "params": [30]
         },
         {
           "name": "style",
           "params": [
             {
-              "offsets": [
-                0,
-                0
-              ]
+              "offsets": [0, 0]
             }
           ]
         }
@@ -406,21 +338,15 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "size",
-          "params": [
-            2
-          ]
+          "params": [2]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(189, 209, 150,1)"
-          ]
+          "params": ["rgba(189, 209, 150,1)"]
         }
       ]
     }
@@ -445,26 +371,9 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "line",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
-        "line-color": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "#1b76ff",
-          "ws",
-          "#ff4c61",
-          "hs",
-          "#ff80ec",
-          "#000000"
-        ],
+        "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"],
         "line-width": 4
       },
       "layout": {},
@@ -478,27 +387,15 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "layout": {
-        "text-field": [
-          "get",
-          "管径"
-        ],
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-field": ["get", "管径"],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": 15,
         "text-transform": "uppercase",
         "symbol-placement": "line",
-        "text-offset": [
-          0,
-          -0.5
-        ],
+        "text-offset": [0, 1.5],
         "text-allow-overlap": true,
         "text-letter-spacing": 1.1
       },
@@ -518,10 +415,7 @@
       "paint": {
         "fill-color": [
           "match",
-          [
-            "get",
-            "dlmc"
-          ],
+          ["get", "dlmc"],
           "水浇地",
           "#fbe5ab",
           "果园",
@@ -614,16 +508,9 @@
       "key": "hubei_xiaogan_hm_city_boundary",
       "source-layer": "hubei_xiaogan_hm_city_boundary",
       "type": "fill",
-      "filter": [
-        "in",
-        "name",
-        ""
-      ],
+      "filter": ["in", "name", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ]
+        "fill-color": ["get", "fill_color"]
       },
       "layout": {},
       "minzoom": 10,
@@ -636,16 +523,9 @@
       "key": "hubei_xiaogan_hm_psfq",
       "source-layer": "hubei_xiaogan_hm_psfq",
       "type": "fill",
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ],
+        "fill-color": ["get", "fill_color"],
         "fill-opacity": 0.4
       },
       "layout": {},
@@ -659,36 +539,17 @@
       "key": "hn_kf_hm_pipeline_point",
       "source-layer": "hn_kf_hm_pipeline_point",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
         "text-halo-width": 2
       },
       "layout": {
-        "icon-image": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "ysj",
-          "ws",
-          "wsj",
-          "hs",
-          "hsj",
-          "ysbz"
-        ],
+        "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
         "icon-size": 0.5,
         "text-field": "{管线点号}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 13,
         "text-line-height": 3,
         "text-anchor": "top"
@@ -704,11 +565,7 @@
       "type": "symbol",
       "minzoom": 0,
       "maxzoom": 24,
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
@@ -717,10 +574,7 @@
       "layout": {
         "icon-image": [
           "match",
-          [
-            "get",
-            "type"
-          ],
+          ["get", "type"],
           "YSBZ",
           "rainBengZhan_icon",
           "WSBZ",
@@ -750,207 +604,86 @@
         "icon-anchor": "center",
         "icon-size": 0.8,
         "text-field": "{name}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 15,
         "text-line-height": 3,
         "text-anchor": "bottom",
         "text-max-width": 50,
-        "text-offset": [
-          0,
-          3
-        ]
+        "text-offset": [0, 3]
       },
       "mType": "geojson"
     }
   ],
   "orders": [
-    [
-      "newfiber-XYZLayer"
-    ],
-    [
-      "hubei_xiaogan_hm_psfq"
-    ],
-    [
-      "city_boundary"
-    ],
-    [
-      "all_boundary"
-    ],
-    [
-      "pipeline_info"
-    ],
-    [
-      "pipeline_point"
-    ],
-    [
-      "pipeLineLabel"
-    ],
-    [
-      "poi_label"
-    ],
-    [
-      "place_label_city"
-    ],
-    [
-      "road_major_label"
-    ],
-    [
-      "place_label_other"
-    ],
-    [
-      "point"
-    ]
+    ["newfiber-XYZLayer"],
+    ["hubei_xiaogan_hm_psfq"],
+    ["city_boundary"],
+    ["all_boundary"],
+    ["pipeline_info"],
+    ["pipeline_point"],
+    ["pipeLineLabel"],
+    ["poi_label"],
+    ["place_label_city"],
+    ["road_major_label"],
+    ["place_label_other"],
+    ["point"]
   ],
   "filter": {
     "wsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ws"], ["ws"], ["ws"]]
     },
     "hsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["hs"], ["hs"], ["hs"]]
     },
     "ysLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ys"], ["ys"], ["ys"]]
     },
     "YSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "YS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["YS"]]
     },
     "WSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "WS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["WS"]]
     },
     "oldCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["老城区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.926
-        ],
+        "center": [113.933, 30.926],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "southCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "南城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["南城新区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.886
-        ],
+        "center": [113.933, 30.886],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "newCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区"]],
       "easeTo": {
-        "center": [
-          113.983,
-          30.896
-        ],
+        "center": [113.983, 30.896],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "allCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区",
-          "南城新区",
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区", "南城新区", "老城区"]],
       "easeTo": {
-        "center": [
-          113.953,
-          30.906
-        ],
+        "center": [113.953, 30.906],
         "zoom": 13.6,
         "pitch": 55
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/newImgs/pumpGY/dxxmBg.jpg b/src/assets/newImgs/pumpGY/dxxmBg.jpg
new file mode 100644
index 0000000..1c2a625
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/dxxmBg.jpg
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/titleBg.png b/src/assets/newImgs/pumpGY/titleBg.png
new file mode 100644
index 0000000..08d95b0
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/titleBg.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/waterFlow.png b/src/assets/newImgs/pumpGY/waterFlow.png
new file mode 100644
index 0000000..3813537
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/waterFlow.png
Binary files differ
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index d95fc38..416cb42 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -64,7 +64,7 @@
     </el-dialog>
 
     <!-- 下垫面统计的图例说明 -->
-    <div class="landAreaC" v-if="menuIndex == 1">
+    <div class="landAreaC" v-if="menuIndex == 1 && showLandXDM">
       <div class="cont flex" v-for="(item, index) in landArr" :key="index">
         <span :style="{ background: item.color }"></span>
         <div class="title">{{ item.title }}</div>
@@ -118,10 +118,16 @@
 
     <!-- 降雨效果 -->
     <CanvasRain v-if="showRainFlow"></CanvasRain>
+
+    <!-- 典型项目效果 -->
+    <el-dialog v-model="showProjectDX" title="典型项目分析" style="width: 1430px" append-to-body>
+      <ProjectDX></ProjectDX>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import ProjectDX from '@/views/sponeScreen/projectHM/projectDX.vue'; //典型项目分析
 import ProjectArea from '@/views/sponeScreen/projectHM/projectArea.vue'; //分区建议
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
@@ -158,6 +164,8 @@
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
+const showLandXDM = ref(false); //下垫面控制
+const showProjectDX = ref(false);
 const areaObj = ref({ value: '0' });
 // 下垫面统计
 const landArr = ref([
@@ -266,10 +274,20 @@
       showRainFlow.value = true;
     }
   });
+  // 下垫面图例控制
+  bus.on('checkLandXDM', params => {
+    showLandXDM.value = params;
+  });
+  // 典型项目分析
+  bus.on('checkProjectDX', params => {
+    showProjectDX.value = true;
+  });
 });
 onBeforeUnmount(() => {
   bus.off('checkProjectArea');
   bus.off('checkRainL');
+  bus.off('checkLandXDM');
+  bus.off('checkProjectDX');
   if (!newfiberMap) return;
   if (newfiberMap) {
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 1be38b4..57090b1 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -81,6 +81,7 @@
   },
 ]);
 const showTotalArea = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -120,6 +121,7 @@
   });
 };
 const showCenterCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -159,6 +161,7 @@
   });
 };
 const showBuiltCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -206,6 +209,7 @@
   // });
 };
 const showOneCenterLayer = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -242,6 +246,7 @@
   });
 };
 const setLayerVisible = () => {
+  bus.emit('checkLandXDM', true);
   // wmsVisibility.value = !wmsVisibility.value;
   newfiberMapBoxVectorLayer.removeByIds([
     'oneCenter',
diff --git a/src/views/sponeScreen/cityGK/canvasRain.vue b/src/views/sponeScreen/cityGK/canvasRain.vue
index 415c5f3..51730f9 100644
--- a/src/views/sponeScreen/cityGK/canvasRain.vue
+++ b/src/views/sponeScreen/cityGK/canvasRain.vue
@@ -61,7 +61,7 @@
       arr[i].show();
       arr[i].run();
     }
-  }, 10);
+  }, 30);
 }
 // 初始化
 function init(ctx1) {
diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue
index d06fe14..ec4bd6d 100644
--- a/src/views/sponeScreen/cityGK/cityplanning.vue
+++ b/src/views/sponeScreen/cityGK/cityplanning.vue
@@ -152,6 +152,7 @@
   },
 ]);
 const showFlowTotalQuantity = () => {
+  bus.emit('checkLandXDM', false);
   let YSFQ2_cope;
 
   //移除一心一核
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 2cb1d5d..7bd3977 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -70,6 +70,7 @@
 function yearclick(val) {
   activedname.value = val.name;
   bus.emit('checkRainL', val.value);
+  bus.emit('checkLandXDM', false);
 }
 
 onBeforeUnmount(() => {
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 68fc98f..d90efab 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -51,7 +51,7 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="Xm" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.Xm" placeholder="请选择项目分析">
+              <el-select v-model="queryParams.XmP" placeholder="请选择项目分析" @change="changeProject">
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -113,9 +113,9 @@
     '06-12 19:00',
   ],
   inverse: true,
-  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 0.5, 4, 1.1, 2.1, 3], //降雨量
+  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 2.5, 2.8, 1.1, 2.1, 3], //降雨量
   yAxis2: [0.1, 0.2, 0.3, 0.2, 0.1, 0.4, 0.3, 0.03, 0.6, 0.1, 0.2, 0.5], //流量
-  yAxis3: [50, 55, 80, 80, 86, 65, 70, 80, 78, 90, 69, 60], //ss
+  yAxis3: [50, 55, 80, 50, 46, 65, 70, 50, 78, 52, 69, 90], //ss
   refresh: 1,
 });
 const chartData1 = ref({
@@ -149,10 +149,7 @@
   { name: '汴京路管网监测点', value: '2' },
 ]);
 
-const XmList = ref([
-  { name: '汴京路管网及道路海绵化改造', value: '1' },
-  { name: '市民公共文化服务综合体建设', value: '2' },
-]);
+const XmList = ref([{ name: '汴京路管网及道路海绵化改造', value: '1' }]);
 
 const XmListA = ref([
   { name: '出口监测点', value: '1' },
@@ -160,7 +157,7 @@
 ]);
 
 const AllData = reactive({
-  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmA: '1', XmQ: '1', XmAQ: '1' },
+  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmP: '', XmA: '', XmQ: '1', XmAQ: '1' },
 });
 const { queryParams } = toRefs(AllData);
 
@@ -184,6 +181,10 @@
     pitch: 30,
   });
 }
+// 项目分析点击
+function changeProject(val) {
+  bus.emit('checkProjectDX', XmList.value[val]);
+}
 </script>
 
 <style lang="scss" scoped>

diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 6ca769f..ddc74d0 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
   "params": {
     "basemap": "https://supermap2.wh-nf.cn:8090/bm",
     "mvt": "https://supermap0.wh-nf.cn:8090/vt",
-    "sprites": [
-      "/static/libs/mapbox/style/sprite/sprite5"
-    ],
+    "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
     "init": {
-      "center": [
-        114.315,
-        34.852
-      ],
+      "center": [114.315, 34.852],
       "zoom": 10.4,
       "pitch": 30,
       "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
       "params": {
         "id": "newfiber-XYZLayer",
         "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ],
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
         "minZoom": 1,
         "maxZoom": 19,
         "tileType": ""
@@ -51,9 +37,7 @@
       "methods": [
         {
           "name": "addTo",
-          "params": [
-            "''||map"
-          ]
+          "params": ["''||map"]
         },
         {
           "name": "hide",
@@ -67,16 +51,7 @@
       "params": {
         "id": "newfiber-WMTSLayer",
         "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ]
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
       },
       "methods": []
     },
@@ -85,12 +60,7 @@
       "type": "CanvasLayer",
       "params": {
         "id": "newfiber-CanvasLayer",
-        "bbox": [
-          110.98300209463804,
-          32.415967161418266,
-          111.34992583909221,
-          32.599933881244255
-        ],
+        "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
         "width": 3000,
         "height": 1172,
         "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "color",
@@ -165,21 +133,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            4
-          ]
+          "params": [4]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -224,28 +186,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(236,223,25,1.0)"
-          ]
+          "params": ["rgba(236,223,25,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            "size",
-            "''||function(v){return v}"
-          ]
+          "params": ["size", "''||function(v){return v}"]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -269,21 +222,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            3
-          ]
+          "params": [3]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -328,27 +275,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(255,0,0,1.0)"
-          ]
+          "params": ["rgba(255,0,0,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            10
-          ]
+          "params": [10]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -372,24 +311,17 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "map_selected"
-          ]
+          "params": ["map_selected"]
         },
         {
           "name": "size",
-          "params": [
-            30
-          ]
+          "params": [30]
         },
         {
           "name": "style",
           "params": [
             {
-              "offsets": [
-                0,
-                0
-              ]
+              "offsets": [0, 0]
             }
           ]
         }
@@ -406,21 +338,15 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "size",
-          "params": [
-            2
-          ]
+          "params": [2]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(189, 209, 150,1)"
-          ]
+          "params": ["rgba(189, 209, 150,1)"]
         }
       ]
     }
@@ -445,26 +371,9 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "line",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
-        "line-color": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "#1b76ff",
-          "ws",
-          "#ff4c61",
-          "hs",
-          "#ff80ec",
-          "#000000"
-        ],
+        "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"],
         "line-width": 4
       },
       "layout": {},
@@ -478,27 +387,15 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "layout": {
-        "text-field": [
-          "get",
-          "管径"
-        ],
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-field": ["get", "管径"],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": 15,
         "text-transform": "uppercase",
         "symbol-placement": "line",
-        "text-offset": [
-          0,
-          -0.5
-        ],
+        "text-offset": [0, 1.5],
         "text-allow-overlap": true,
         "text-letter-spacing": 1.1
       },
@@ -518,10 +415,7 @@
       "paint": {
         "fill-color": [
           "match",
-          [
-            "get",
-            "dlmc"
-          ],
+          ["get", "dlmc"],
           "水浇地",
           "#fbe5ab",
           "果园",
@@ -614,16 +508,9 @@
       "key": "hubei_xiaogan_hm_city_boundary",
       "source-layer": "hubei_xiaogan_hm_city_boundary",
       "type": "fill",
-      "filter": [
-        "in",
-        "name",
-        ""
-      ],
+      "filter": ["in", "name", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ]
+        "fill-color": ["get", "fill_color"]
       },
       "layout": {},
       "minzoom": 10,
@@ -636,16 +523,9 @@
       "key": "hubei_xiaogan_hm_psfq",
       "source-layer": "hubei_xiaogan_hm_psfq",
       "type": "fill",
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ],
+        "fill-color": ["get", "fill_color"],
         "fill-opacity": 0.4
       },
       "layout": {},
@@ -659,36 +539,17 @@
       "key": "hn_kf_hm_pipeline_point",
       "source-layer": "hn_kf_hm_pipeline_point",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
         "text-halo-width": 2
       },
       "layout": {
-        "icon-image": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "ysj",
-          "ws",
-          "wsj",
-          "hs",
-          "hsj",
-          "ysbz"
-        ],
+        "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
         "icon-size": 0.5,
         "text-field": "{管线点号}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 13,
         "text-line-height": 3,
         "text-anchor": "top"
@@ -704,11 +565,7 @@
       "type": "symbol",
       "minzoom": 0,
       "maxzoom": 24,
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
@@ -717,10 +574,7 @@
       "layout": {
         "icon-image": [
           "match",
-          [
-            "get",
-            "type"
-          ],
+          ["get", "type"],
           "YSBZ",
           "rainBengZhan_icon",
           "WSBZ",
@@ -750,207 +604,86 @@
         "icon-anchor": "center",
         "icon-size": 0.8,
         "text-field": "{name}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 15,
         "text-line-height": 3,
         "text-anchor": "bottom",
         "text-max-width": 50,
-        "text-offset": [
-          0,
-          3
-        ]
+        "text-offset": [0, 3]
       },
       "mType": "geojson"
     }
   ],
   "orders": [
-    [
-      "newfiber-XYZLayer"
-    ],
-    [
-      "hubei_xiaogan_hm_psfq"
-    ],
-    [
-      "city_boundary"
-    ],
-    [
-      "all_boundary"
-    ],
-    [
-      "pipeline_info"
-    ],
-    [
-      "pipeline_point"
-    ],
-    [
-      "pipeLineLabel"
-    ],
-    [
-      "poi_label"
-    ],
-    [
-      "place_label_city"
-    ],
-    [
-      "road_major_label"
-    ],
-    [
-      "place_label_other"
-    ],
-    [
-      "point"
-    ]
+    ["newfiber-XYZLayer"],
+    ["hubei_xiaogan_hm_psfq"],
+    ["city_boundary"],
+    ["all_boundary"],
+    ["pipeline_info"],
+    ["pipeline_point"],
+    ["pipeLineLabel"],
+    ["poi_label"],
+    ["place_label_city"],
+    ["road_major_label"],
+    ["place_label_other"],
+    ["point"]
   ],
   "filter": {
     "wsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ws"], ["ws"], ["ws"]]
     },
     "hsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["hs"], ["hs"], ["hs"]]
     },
     "ysLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ys"], ["ys"], ["ys"]]
     },
     "YSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "YS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["YS"]]
     },
     "WSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "WS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["WS"]]
     },
     "oldCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["老城区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.926
-        ],
+        "center": [113.933, 30.926],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "southCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "南城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["南城新区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.886
-        ],
+        "center": [113.933, 30.886],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "newCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区"]],
       "easeTo": {
-        "center": [
-          113.983,
-          30.896
-        ],
+        "center": [113.983, 30.896],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "allCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区",
-          "南城新区",
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区", "南城新区", "老城区"]],
       "easeTo": {
-        "center": [
-          113.953,
-          30.906
-        ],
+        "center": [113.953, 30.906],
         "zoom": 13.6,
         "pitch": 55
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/newImgs/pumpGY/dxxmBg.jpg b/src/assets/newImgs/pumpGY/dxxmBg.jpg
new file mode 100644
index 0000000..1c2a625
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/dxxmBg.jpg
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/titleBg.png b/src/assets/newImgs/pumpGY/titleBg.png
new file mode 100644
index 0000000..08d95b0
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/titleBg.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/waterFlow.png b/src/assets/newImgs/pumpGY/waterFlow.png
new file mode 100644
index 0000000..3813537
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/waterFlow.png
Binary files differ
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index d95fc38..416cb42 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -64,7 +64,7 @@
     </el-dialog>
 
     <!-- 下垫面统计的图例说明 -->
-    <div class="landAreaC" v-if="menuIndex == 1">
+    <div class="landAreaC" v-if="menuIndex == 1 && showLandXDM">
       <div class="cont flex" v-for="(item, index) in landArr" :key="index">
         <span :style="{ background: item.color }"></span>
         <div class="title">{{ item.title }}</div>
@@ -118,10 +118,16 @@
 
     <!-- 降雨效果 -->
     <CanvasRain v-if="showRainFlow"></CanvasRain>
+
+    <!-- 典型项目效果 -->
+    <el-dialog v-model="showProjectDX" title="典型项目分析" style="width: 1430px" append-to-body>
+      <ProjectDX></ProjectDX>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import ProjectDX from '@/views/sponeScreen/projectHM/projectDX.vue'; //典型项目分析
 import ProjectArea from '@/views/sponeScreen/projectHM/projectArea.vue'; //分区建议
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
@@ -158,6 +164,8 @@
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
+const showLandXDM = ref(false); //下垫面控制
+const showProjectDX = ref(false);
 const areaObj = ref({ value: '0' });
 // 下垫面统计
 const landArr = ref([
@@ -266,10 +274,20 @@
       showRainFlow.value = true;
     }
   });
+  // 下垫面图例控制
+  bus.on('checkLandXDM', params => {
+    showLandXDM.value = params;
+  });
+  // 典型项目分析
+  bus.on('checkProjectDX', params => {
+    showProjectDX.value = true;
+  });
 });
 onBeforeUnmount(() => {
   bus.off('checkProjectArea');
   bus.off('checkRainL');
+  bus.off('checkLandXDM');
+  bus.off('checkProjectDX');
   if (!newfiberMap) return;
   if (newfiberMap) {
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 1be38b4..57090b1 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -81,6 +81,7 @@
   },
 ]);
 const showTotalArea = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -120,6 +121,7 @@
   });
 };
 const showCenterCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -159,6 +161,7 @@
   });
 };
 const showBuiltCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -206,6 +209,7 @@
   // });
 };
 const showOneCenterLayer = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -242,6 +246,7 @@
   });
 };
 const setLayerVisible = () => {
+  bus.emit('checkLandXDM', true);
   // wmsVisibility.value = !wmsVisibility.value;
   newfiberMapBoxVectorLayer.removeByIds([
     'oneCenter',
diff --git a/src/views/sponeScreen/cityGK/canvasRain.vue b/src/views/sponeScreen/cityGK/canvasRain.vue
index 415c5f3..51730f9 100644
--- a/src/views/sponeScreen/cityGK/canvasRain.vue
+++ b/src/views/sponeScreen/cityGK/canvasRain.vue
@@ -61,7 +61,7 @@
       arr[i].show();
       arr[i].run();
     }
-  }, 10);
+  }, 30);
 }
 // 初始化
 function init(ctx1) {
diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue
index d06fe14..ec4bd6d 100644
--- a/src/views/sponeScreen/cityGK/cityplanning.vue
+++ b/src/views/sponeScreen/cityGK/cityplanning.vue
@@ -152,6 +152,7 @@
   },
 ]);
 const showFlowTotalQuantity = () => {
+  bus.emit('checkLandXDM', false);
   let YSFQ2_cope;
 
   //移除一心一核
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 2cb1d5d..7bd3977 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -70,6 +70,7 @@
 function yearclick(val) {
   activedname.value = val.name;
   bus.emit('checkRainL', val.value);
+  bus.emit('checkLandXDM', false);
 }
 
 onBeforeUnmount(() => {
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 68fc98f..d90efab 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -51,7 +51,7 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="Xm" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.Xm" placeholder="请选择项目分析">
+              <el-select v-model="queryParams.XmP" placeholder="请选择项目分析" @change="changeProject">
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -113,9 +113,9 @@
     '06-12 19:00',
   ],
   inverse: true,
-  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 0.5, 4, 1.1, 2.1, 3], //降雨量
+  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 2.5, 2.8, 1.1, 2.1, 3], //降雨量
   yAxis2: [0.1, 0.2, 0.3, 0.2, 0.1, 0.4, 0.3, 0.03, 0.6, 0.1, 0.2, 0.5], //流量
-  yAxis3: [50, 55, 80, 80, 86, 65, 70, 80, 78, 90, 69, 60], //ss
+  yAxis3: [50, 55, 80, 50, 46, 65, 70, 50, 78, 52, 69, 90], //ss
   refresh: 1,
 });
 const chartData1 = ref({
@@ -149,10 +149,7 @@
   { name: '汴京路管网监测点', value: '2' },
 ]);
 
-const XmList = ref([
-  { name: '汴京路管网及道路海绵化改造', value: '1' },
-  { name: '市民公共文化服务综合体建设', value: '2' },
-]);
+const XmList = ref([{ name: '汴京路管网及道路海绵化改造', value: '1' }]);
 
 const XmListA = ref([
   { name: '出口监测点', value: '1' },
@@ -160,7 +157,7 @@
 ]);
 
 const AllData = reactive({
-  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmA: '1', XmQ: '1', XmAQ: '1' },
+  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmP: '', XmA: '', XmQ: '1', XmAQ: '1' },
 });
 const { queryParams } = toRefs(AllData);
 
@@ -184,6 +181,10 @@
     pitch: 30,
   });
 }
+// 项目分析点击
+function changeProject(val) {
+  bus.emit('checkProjectDX', XmList.value[val]);
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/projectHM/canvasRain.vue b/src/views/sponeScreen/projectHM/canvasRain.vue
new file mode 100644
index 0000000..549c954
--- /dev/null
+++ b/src/views/sponeScreen/projectHM/canvasRain.vue
@@ -0,0 +1,109 @@
+<template>
+  <!-- 降雨效果canvas -->
+  <div class="canvasRainPage">
+    <canvas id="canvasRain"></canvas>
+  </div>
+</template>
+
+<script setup>
+const { proxy } = getCurrentInstance();
+const props = defineProps({
+  width: { type: Number },
+  height: { type: Number },
+});
+const timer = ref(null);
+
+// 画笔
+const ctx = ref(null);
+// 画布的宽高
+let w = props.width;
+let h = props.height;
+// 存放雨滴的数组
+let arr = [];
+// 雨滴的数量
+const size = ref(200);
+// 雨滴的构造函数
+class Rain {
+  x = random(w);
+  y = random(h);
+  ySpeed = random(2) + 8;
+  show() {
+    drawLine(this.x, this.y);
+  }
+  run() {
+    if (this.y > h) {
+      this.y = 0;
+      this.x = random(w);
+    }
+    this.y = this.y + this.ySpeed;
+  }
+}
+// 画线（雨滴）
+function drawLine(x1, y1) {
+  ctx.value.beginPath();
+  ctx.value.strokeStyle = 'rgba(35, 195, 255, 0.6)';
+  ctx.value.moveTo(x1, y1);
+  // 雨长度
+  ctx.value.lineTo(x1, y1 + 20);
+  ctx.value.stroke();
+}
+// 生成随机数
+function random(num) {
+  return Math.random() * num;
+}
+// 开始
+function start() {
+  for (let i = 0; i < size.value; i++) {
+    let rain = new Rain();
+    arr.push(rain);
+    rain.show();
+  }
+  timer.value = setInterval(() => {
+    ctx.value.clearRect(0, 0, w, h);
+    for (let i = 0; i < size.value; i++) {
+      arr[i].show();
+      arr[i].run();
+    }
+  }, 30);
+}
+// 初始化
+function init(ctx1) {
+  ctx.value = ctx1;
+  start();
+}
+
+// 清除画布
+function clearDraw() {
+  ctx.value.clearRect(0, 0, w, h);
+}
+
+// 初始化
+function initCanvas() {
+  const canvas = document.querySelector('#canvasRain');
+  ctx.value = canvas.getContext('2d');
+  canvas.width = w;
+  canvas.height = h;
+  init(ctx.value);
+}
+
+onMounted(() => {
+  initCanvas();
+});
+onBeforeUnmount(() => {
+  if (timer.value) clearInterval(timer.value);
+  clearDraw();
+});
+</script>
+
+<style lang="scss" scoped>
+.canvasRainPage {
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 59, 109, 0.2);
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  z-index: 100;
+  pointer-events: none;
+}
+</style>

diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json
index 6ca769f..ddc74d0 100644
--- a/public/static/libs/mapbox/style/HaiMianScreen.json
+++ b/public/static/libs/mapbox/style/HaiMianScreen.json
@@ -2,14 +2,9 @@
   "params": {
     "basemap": "https://supermap2.wh-nf.cn:8090/bm",
     "mvt": "https://supermap0.wh-nf.cn:8090/vt",
-    "sprites": [
-      "/static/libs/mapbox/style/sprite/sprite5"
-    ],
+    "sprites": ["/static/libs/mapbox/style/sprite/sprite5"],
     "init": {
-      "center": [
-        114.315,
-        34.852
-      ],
+      "center": [114.315, 34.852],
       "zoom": 10.4,
       "pitch": 30,
       "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json"
@@ -34,16 +29,7 @@
       "params": {
         "id": "newfiber-XYZLayer",
         "url": "https://t{s}.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=a603e07a17766447f9e74f14c5454efa",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ],
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"],
         "minZoom": 1,
         "maxZoom": 19,
         "tileType": ""
@@ -51,9 +37,7 @@
       "methods": [
         {
           "name": "addTo",
-          "params": [
-            "''||map"
-          ]
+          "params": ["''||map"]
         },
         {
           "name": "hide",
@@ -67,16 +51,7 @@
       "params": {
         "id": "newfiber-WMTSLayer",
         "url": "https://t{s}.tianditu.gov.cn/img_c/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=c&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=5095c97223409ac114493d71ecb9cd87",
-        "subdomains": [
-          "0",
-          "1",
-          "2",
-          "3",
-          "4",
-          "5",
-          "6",
-          "7"
-        ]
+        "subdomains": ["0", "1", "2", "3", "4", "5", "6", "7"]
       },
       "methods": []
     },
@@ -85,12 +60,7 @@
       "type": "CanvasLayer",
       "params": {
         "id": "newfiber-CanvasLayer",
-        "bbox": [
-          110.98300209463804,
-          32.415967161418266,
-          111.34992583909221,
-          32.599933881244255
-        ],
+        "bbox": [110.98300209463804, 32.415967161418266, 111.34992583909221, 32.599933881244255],
         "width": 3000,
         "height": 1172,
         "images": "''||Array(16).fill().map((i,idx)=> `https://server1.wh-nf.cn:9000/newfiber-standard/2024/01/06/step${idx+1}.png`)"
@@ -121,9 +91,7 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "color",
@@ -165,21 +133,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            4
-          ]
+          "params": [4]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -224,28 +186,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(236,223,25,1.0)"
-          ]
+          "params": ["rgba(236,223,25,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            "size",
-            "''||function(v){return v}"
-          ]
+          "params": ["size", "''||function(v){return v}"]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -269,21 +222,15 @@
       "methods": [
         {
           "name": "size",
-          "params": [
-            3
-          ]
+          "params": [3]
         },
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "texture",
-          "params": [
-            "02"
-          ]
+          "params": ["02"]
         },
         {
           "name": "color",
@@ -328,27 +275,19 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "circle"
-          ]
+          "params": ["circle"]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(255,0,0,1.0)"
-          ]
+          "params": ["rgba(255,0,0,1.0)"]
         },
         {
           "name": "size",
-          "params": [
-            10
-          ]
+          "params": [10]
         },
         {
           "name": "animate",
-          "params": [
-            true
-          ]
+          "params": [true]
         },
         {
           "name": "style",
@@ -372,24 +311,17 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "map_selected"
-          ]
+          "params": ["map_selected"]
         },
         {
           "name": "size",
-          "params": [
-            30
-          ]
+          "params": [30]
         },
         {
           "name": "style",
           "params": [
             {
-              "offsets": [
-                0,
-                0
-              ]
+              "offsets": [0, 0]
             }
           ]
         }
@@ -406,21 +338,15 @@
       "methods": [
         {
           "name": "shape",
-          "params": [
-            "line"
-          ]
+          "params": ["line"]
         },
         {
           "name": "size",
-          "params": [
-            2
-          ]
+          "params": [2]
         },
         {
           "name": "color",
-          "params": [
-            "rgba(189, 209, 150,1)"
-          ]
+          "params": ["rgba(189, 209, 150,1)"]
         }
       ]
     }
@@ -445,26 +371,9 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "line",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
-        "line-color": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "#1b76ff",
-          "ws",
-          "#ff4c61",
-          "hs",
-          "#ff80ec",
-          "#000000"
-        ],
+        "line-color": ["match", ["get", "类型"], "ys", "#1b76ff", "ws", "#ff4c61", "hs", "#ff80ec", "#000000"],
         "line-width": 4
       },
       "layout": {},
@@ -478,27 +387,15 @@
       "key": "hn_kf_hm_pipeline",
       "source-layer": "hn_kf_hm_pipeline",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "layout": {
-        "text-field": [
-          "get",
-          "管径"
-        ],
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-field": ["get", "管径"],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-rotation-alignment": "map",
         "text-size": 15,
         "text-transform": "uppercase",
         "symbol-placement": "line",
-        "text-offset": [
-          0,
-          -0.5
-        ],
+        "text-offset": [0, 1.5],
         "text-allow-overlap": true,
         "text-letter-spacing": 1.1
       },
@@ -518,10 +415,7 @@
       "paint": {
         "fill-color": [
           "match",
-          [
-            "get",
-            "dlmc"
-          ],
+          ["get", "dlmc"],
           "水浇地",
           "#fbe5ab",
           "果园",
@@ -614,16 +508,9 @@
       "key": "hubei_xiaogan_hm_city_boundary",
       "source-layer": "hubei_xiaogan_hm_city_boundary",
       "type": "fill",
-      "filter": [
-        "in",
-        "name",
-        ""
-      ],
+      "filter": ["in", "name", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ]
+        "fill-color": ["get", "fill_color"]
       },
       "layout": {},
       "minzoom": 10,
@@ -636,16 +523,9 @@
       "key": "hubei_xiaogan_hm_psfq",
       "source-layer": "hubei_xiaogan_hm_psfq",
       "type": "fill",
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
-        "fill-color": [
-          "get",
-          "fill_color"
-        ],
+        "fill-color": ["get", "fill_color"],
         "fill-opacity": 0.4
       },
       "layout": {},
@@ -659,36 +539,17 @@
       "key": "hn_kf_hm_pipeline_point",
       "source-layer": "hn_kf_hm_pipeline_point",
       "type": "symbol",
-      "filter": [
-        "in",
-        "类型",
-        ""
-      ],
+      "filter": ["in", "类型", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
         "text-halo-width": 2
       },
       "layout": {
-        "icon-image": [
-          "match",
-          [
-            "get",
-            "类型"
-          ],
-          "ys",
-          "ysj",
-          "ws",
-          "wsj",
-          "hs",
-          "hsj",
-          "ysbz"
-        ],
+        "icon-image": ["match", ["get", "类型"], "ys", "ysj", "ws", "wsj", "hs", "hsj", "ysbz"],
         "icon-size": 0.5,
         "text-field": "{管线点号}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 13,
         "text-line-height": 3,
         "text-anchor": "top"
@@ -704,11 +565,7 @@
       "type": "symbol",
       "minzoom": 0,
       "maxzoom": 24,
-      "filter": [
-        "in",
-        "type",
-        ""
-      ],
+      "filter": ["in", "type", ""],
       "paint": {
         "text-color": "rgba(255, 255, 255, 1)",
         "text-halo-color": "rgba(14, 139, 90, 1)",
@@ -717,10 +574,7 @@
       "layout": {
         "icon-image": [
           "match",
-          [
-            "get",
-            "type"
-          ],
+          ["get", "type"],
           "YSBZ",
           "rainBengZhan_icon",
           "WSBZ",
@@ -750,207 +604,86 @@
         "icon-anchor": "center",
         "icon-size": 0.8,
         "text-field": "{name}",
-        "text-font": [
-          "KlokanTech Noto Sans Regular"
-        ],
+        "text-font": ["KlokanTech Noto Sans Regular"],
         "text-size": 15,
         "text-line-height": 3,
         "text-anchor": "bottom",
         "text-max-width": 50,
-        "text-offset": [
-          0,
-          3
-        ]
+        "text-offset": [0, 3]
       },
       "mType": "geojson"
     }
   ],
   "orders": [
-    [
-      "newfiber-XYZLayer"
-    ],
-    [
-      "hubei_xiaogan_hm_psfq"
-    ],
-    [
-      "city_boundary"
-    ],
-    [
-      "all_boundary"
-    ],
-    [
-      "pipeline_info"
-    ],
-    [
-      "pipeline_point"
-    ],
-    [
-      "pipeLineLabel"
-    ],
-    [
-      "poi_label"
-    ],
-    [
-      "place_label_city"
-    ],
-    [
-      "road_major_label"
-    ],
-    [
-      "place_label_other"
-    ],
-    [
-      "point"
-    ]
+    ["newfiber-XYZLayer"],
+    ["hubei_xiaogan_hm_psfq"],
+    ["city_boundary"],
+    ["all_boundary"],
+    ["pipeline_info"],
+    ["pipeline_point"],
+    ["pipeLineLabel"],
+    ["poi_label"],
+    ["place_label_city"],
+    ["road_major_label"],
+    ["place_label_other"],
+    ["point"]
   ],
   "filter": {
     "wsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ],
-        [
-          "ws"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ws"], ["ws"], ["ws"]]
     },
     "hsLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ],
-        [
-          "hs"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["hs"], ["hs"], ["hs"]]
     },
     "ysLine1": {
-      "layerName": [
-        "pipeline_info",
-        "pipeline_point",
-        "pipeLineLabel"
-      ],
-      "filter": [
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ],
-        [
-          "ys"
-        ]
-      ]
+      "layerName": ["pipeline_info", "pipeline_point", "pipeLineLabel"],
+      "filter": [["ys"], ["ys"], ["ys"]]
     },
     "YSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "YS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["YS"]]
     },
     "WSFQ": {
-      "layerName": [
-        "hubei_xiaogan_hm_psfq"
-      ],
-      "filter": [
-        [
-          "WS"
-        ]
-      ]
+      "layerName": ["hubei_xiaogan_hm_psfq"],
+      "filter": [["WS"]]
     },
     "oldCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["老城区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.926
-        ],
+        "center": [113.933, 30.926],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "southCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "南城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["南城新区"]],
       "easeTo": {
-        "center": [
-          113.933,
-          30.886
-        ],
+        "center": [113.933, 30.886],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "newCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区"]],
       "easeTo": {
-        "center": [
-          113.983,
-          30.896
-        ],
+        "center": [113.983, 30.896],
         "zoom": 13.6,
         "pitch": 55
       }
     },
     "allCity": {
-      "layerName": [
-        "city_boundary"
-      ],
-      "filter": [
-        [
-          "东城新区",
-          "南城新区",
-          "老城区"
-        ]
-      ],
+      "layerName": ["city_boundary"],
+      "filter": [["东城新区", "南城新区", "老城区"]],
       "easeTo": {
-        "center": [
-          113.953,
-          30.906
-        ],
+        "center": [113.953, 30.906],
         "zoom": 13.6,
         "pitch": 55
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/newImgs/pumpGY/dxxmBg.jpg b/src/assets/newImgs/pumpGY/dxxmBg.jpg
new file mode 100644
index 0000000..1c2a625
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/dxxmBg.jpg
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/titleBg.png b/src/assets/newImgs/pumpGY/titleBg.png
new file mode 100644
index 0000000..08d95b0
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/titleBg.png
Binary files differ
diff --git a/src/assets/newImgs/pumpGY/waterFlow.png b/src/assets/newImgs/pumpGY/waterFlow.png
new file mode 100644
index 0000000..3813537
--- /dev/null
+++ b/src/assets/newImgs/pumpGY/waterFlow.png
Binary files differ
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index d95fc38..416cb42 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -64,7 +64,7 @@
     </el-dialog>
 
     <!-- 下垫面统计的图例说明 -->
-    <div class="landAreaC" v-if="menuIndex == 1">
+    <div class="landAreaC" v-if="menuIndex == 1 && showLandXDM">
       <div class="cont flex" v-for="(item, index) in landArr" :key="index">
         <span :style="{ background: item.color }"></span>
         <div class="title">{{ item.title }}</div>
@@ -118,10 +118,16 @@
 
     <!-- 降雨效果 -->
     <CanvasRain v-if="showRainFlow"></CanvasRain>
+
+    <!-- 典型项目效果 -->
+    <el-dialog v-model="showProjectDX" title="典型项目分析" style="width: 1430px" append-to-body>
+      <ProjectDX></ProjectDX>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import ProjectDX from '@/views/sponeScreen/projectHM/projectDX.vue'; //典型项目分析
 import ProjectArea from '@/views/sponeScreen/projectHM/projectArea.vue'; //分区建议
 import gisMapBox from '@/views/gisMapPage/gisMapBox1.vue';
 import GisMapMF from '@/views/sponeScreen/gisMF/cesiumMap.vue';
@@ -158,6 +164,8 @@
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
+const showLandXDM = ref(false); //下垫面控制
+const showProjectDX = ref(false);
 const areaObj = ref({ value: '0' });
 // 下垫面统计
 const landArr = ref([
@@ -266,10 +274,20 @@
       showRainFlow.value = true;
     }
   });
+  // 下垫面图例控制
+  bus.on('checkLandXDM', params => {
+    showLandXDM.value = params;
+  });
+  // 典型项目分析
+  bus.on('checkProjectDX', params => {
+    showProjectDX.value = true;
+  });
 });
 onBeforeUnmount(() => {
   bus.off('checkProjectArea');
   bus.off('checkRainL');
+  bus.off('checkLandXDM');
+  bus.off('checkProjectDX');
   if (!newfiberMap) return;
   if (newfiberMap) {
     let _originalGLContext = newfiberMap.getMap().scene?.context._originalGLContext;
diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
index 1be38b4..57090b1 100644
--- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue
+++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue
@@ -81,6 +81,7 @@
   },
 ]);
 const showTotalArea = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -120,6 +121,7 @@
   });
 };
 const showCenterCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -159,6 +161,7 @@
   });
 };
 const showBuiltCity = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -206,6 +209,7 @@
   // });
 };
 const showOneCenterLayer = () => {
+  bus.emit('checkLandXDM', false);
   if (newfiberMapbox.map.getLayer('hn_kf_hm_dltb')) {
     newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none');
   }
@@ -242,6 +246,7 @@
   });
 };
 const setLayerVisible = () => {
+  bus.emit('checkLandXDM', true);
   // wmsVisibility.value = !wmsVisibility.value;
   newfiberMapBoxVectorLayer.removeByIds([
     'oneCenter',
diff --git a/src/views/sponeScreen/cityGK/canvasRain.vue b/src/views/sponeScreen/cityGK/canvasRain.vue
index 415c5f3..51730f9 100644
--- a/src/views/sponeScreen/cityGK/canvasRain.vue
+++ b/src/views/sponeScreen/cityGK/canvasRain.vue
@@ -61,7 +61,7 @@
       arr[i].show();
       arr[i].run();
     }
-  }, 10);
+  }, 30);
 }
 // 初始化
 function init(ctx1) {
diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue
index d06fe14..ec4bd6d 100644
--- a/src/views/sponeScreen/cityGK/cityplanning.vue
+++ b/src/views/sponeScreen/cityGK/cityplanning.vue
@@ -152,6 +152,7 @@
   },
 ]);
 const showFlowTotalQuantity = () => {
+  bus.emit('checkLandXDM', false);
   let YSFQ2_cope;
 
   //移除一心一核
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 2cb1d5d..7bd3977 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -70,6 +70,7 @@
 function yearclick(val) {
   activedname.value = val.name;
   bus.emit('checkRainL', val.value);
+  bus.emit('checkLandXDM', false);
 }
 
 onBeforeUnmount(() => {
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 68fc98f..d90efab 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -51,7 +51,7 @@
           </div>
           <div class="Selectionbox">
             <el-form-item prop="Xm" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.Xm" placeholder="请选择项目分析">
+              <el-select v-model="queryParams.XmP" placeholder="请选择项目分析" @change="changeProject">
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -113,9 +113,9 @@
     '06-12 19:00',
   ],
   inverse: true,
-  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 0.5, 4, 1.1, 2.1, 3], //降雨量
+  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 2.5, 2.8, 1.1, 2.1, 3], //降雨量
   yAxis2: [0.1, 0.2, 0.3, 0.2, 0.1, 0.4, 0.3, 0.03, 0.6, 0.1, 0.2, 0.5], //流量
-  yAxis3: [50, 55, 80, 80, 86, 65, 70, 80, 78, 90, 69, 60], //ss
+  yAxis3: [50, 55, 80, 50, 46, 65, 70, 50, 78, 52, 69, 90], //ss
   refresh: 1,
 });
 const chartData1 = ref({
@@ -149,10 +149,7 @@
   { name: '汴京路管网监测点', value: '2' },
 ]);
 
-const XmList = ref([
-  { name: '汴京路管网及道路海绵化改造', value: '1' },
-  { name: '市民公共文化服务综合体建设', value: '2' },
-]);
+const XmList = ref([{ name: '汴京路管网及道路海绵化改造', value: '1' }]);
 
 const XmListA = ref([
   { name: '出口监测点', value: '1' },
@@ -160,7 +157,7 @@
 ]);
 
 const AllData = reactive({
-  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmA: '1', XmQ: '1', XmAQ: '1' },
+  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmP: '', XmA: '', XmQ: '1', XmAQ: '1' },
 });
 const { queryParams } = toRefs(AllData);
 
@@ -184,6 +181,10 @@
     pitch: 30,
   });
 }
+// 项目分析点击
+function changeProject(val) {
+  bus.emit('checkProjectDX', XmList.value[val]);
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/projectHM/canvasRain.vue b/src/views/sponeScreen/projectHM/canvasRain.vue
new file mode 100644
index 0000000..549c954
--- /dev/null
+++ b/src/views/sponeScreen/projectHM/canvasRain.vue
@@ -0,0 +1,109 @@
+<template>
+  <!-- 降雨效果canvas -->
+  <div class="canvasRainPage">
+    <canvas id="canvasRain"></canvas>
+  </div>
+</template>
+
+<script setup>
+const { proxy } = getCurrentInstance();
+const props = defineProps({
+  width: { type: Number },
+  height: { type: Number },
+});
+const timer = ref(null);
+
+// 画笔
+const ctx = ref(null);
+// 画布的宽高
+let w = props.width;
+let h = props.height;
+// 存放雨滴的数组
+let arr = [];
+// 雨滴的数量
+const size = ref(200);
+// 雨滴的构造函数
+class Rain {
+  x = random(w);
+  y = random(h);
+  ySpeed = random(2) + 8;
+  show() {
+    drawLine(this.x, this.y);
+  }
+  run() {
+    if (this.y > h) {
+      this.y = 0;
+      this.x = random(w);
+    }
+    this.y = this.y + this.ySpeed;
+  }
+}
+// 画线（雨滴）
+function drawLine(x1, y1) {
+  ctx.value.beginPath();
+  ctx.value.strokeStyle = 'rgba(35, 195, 255, 0.6)';
+  ctx.value.moveTo(x1, y1);
+  // 雨长度
+  ctx.value.lineTo(x1, y1 + 20);
+  ctx.value.stroke();
+}
+// 生成随机数
+function random(num) {
+  return Math.random() * num;
+}
+// 开始
+function start() {
+  for (let i = 0; i < size.value; i++) {
+    let rain = new Rain();
+    arr.push(rain);
+    rain.show();
+  }
+  timer.value = setInterval(() => {
+    ctx.value.clearRect(0, 0, w, h);
+    for (let i = 0; i < size.value; i++) {
+      arr[i].show();
+      arr[i].run();
+    }
+  }, 30);
+}
+// 初始化
+function init(ctx1) {
+  ctx.value = ctx1;
+  start();
+}
+
+// 清除画布
+function clearDraw() {
+  ctx.value.clearRect(0, 0, w, h);
+}
+
+// 初始化
+function initCanvas() {
+  const canvas = document.querySelector('#canvasRain');
+  ctx.value = canvas.getContext('2d');
+  canvas.width = w;
+  canvas.height = h;
+  init(ctx.value);
+}
+
+onMounted(() => {
+  initCanvas();
+});
+onBeforeUnmount(() => {
+  if (timer.value) clearInterval(timer.value);
+  clearDraw();
+});
+</script>
+
+<style lang="scss" scoped>
+.canvasRainPage {
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 59, 109, 0.2);
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  z-index: 100;
+  pointer-events: none;
+}
+</style>
diff --git a/src/views/sponeScreen/projectHM/projectDX.vue b/src/views/sponeScreen/projectHM/projectDX.vue
new file mode 100644
index 0000000..48f75ec
--- /dev/null
+++ b/src/views/sponeScreen/projectHM/projectDX.vue
@@ -0,0 +1,112 @@
+<template>
+  <!-- 典型项目分析 -->
+  <div class="projectDXPage">
+    <!-- 分析结果建议 -->
+    <div class="suggest">
+      <div class="title">监测分析建议(24小时累计60mm降雨)</div>
+      <p>1,该项目设计总调蓄容积5.8m³；</p>
+      <p>2,海绵设施留蓄水量2.6吨；</p>
+      <p>3,溢流时长1.4h，排出3.2吨</p>
+      <p>4,根据进出口的ss对比，海绵设施的净化能力达标</p>
+    </div>
+
+    <!-- 降雨效果 -->
+    <CanvasRain :width="1382" :height="800"></CanvasRain>
+
+    <!-- 水位 水流 -->
+    <img src="@/assets/newImgs/pumpGY/water.png" alt="" class="waterFlow" :style="{ height: 30 + 'px' }" />
+
+    <!-- 实时数据 -->
+    <div class="realData">
+      <p style="left: 500px; bottom: 95px">管径：1.4 x 1.0米</p>
+      <p style="left: 700px; bottom: 95px">实时水位：2.3米</p>
+      <p style="right: 230px; bottom: 65px">进口流量：0.1m/s</p>
+      <p style="right: 230px; bottom: 25px">进口SS：85mg/L</p>
+      <p style="left: 60px; bottom: 65px">出口流量：0.23m/s</p>
+      <p style="left: 60px; bottom: 25px">出口SS：66mg/L</p>
+    </div>
+
+    <!-- 水流方向 -->
+    <div class="waterFX">
+      <img src="@/assets/newImgs/pumpGY/waterFlow.png" alt="左1" style="left: 210px; bottom: 195px; transform: rotate(90deg)" />
+
+      <img src="@/assets/newImgs/pumpGY/waterFlow.png" alt="中间1" style="left: 320px; bottom: 625px; transform: rotate(80deg)" />
+      <img src="@/assets/newImgs/pumpGY/waterFlow.png" alt="中间2" style="left: 360px; bottom: 425px; transform: rotate(80deg)" />
+      <img src="@/assets/newImgs/pumpGY/waterFlow.png" alt="中间3" style="left: 385px; bottom: 195px; transform: rotate(90deg)" />
+
+      <img src="@/assets/newImgs/pumpGY/waterFlow.png" alt="右1" style="right: 110px; bottom: 425px; transform: rotate(180deg)" />
+      <img src="@/assets/newImgs/pumpGY/waterFlow.png" alt="右2" style="right: 350px; bottom: 355px; transform: rotate(120deg)" />
+      <img src="@/assets/newImgs/pumpGY/waterFlow.png" alt="右3" style="right: 379px; bottom: 195px; transform: rotate(90deg)" />
+
+      <img src="@/assets/newImgs/pumpGY/waterFlow.png" alt="下1" style="left: 350px; bottom: 5px; transform: rotate(180deg)" />
+      <img src="@/assets/newImgs/pumpGY/waterFlow.png" alt="下2" style="right: 480px; bottom: 5px; transform: rotate(180deg)" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import CanvasRain from '@/views/sponeScreen/projectHM/canvasRain.vue';
+const { proxy } = getCurrentInstance();
+
+onMounted(() => {});
+</script>
+
+<style lang="scss" scoped>
+// prettier-ignore
+.projectDXPage {
+  width: 1382PX;
+  height: 800PX;
+  margin-bottom:20PX;
+  background: url('@/assets/newImgs/pumpGY/dxxmBg.jpg') no-repeat;
+  background-size: 100% 100%;
+  position:relative;
+  .suggest{
+    position:absolute;
+    z-index: 20;
+    left:15PX;
+    top:15PX;
+    width:384PX;
+    background: linear-gradient(90deg, #2D459E 0%, rgba(45,69,158,0.4) 100%);
+    color:#fff;
+    .title{
+      width:384PX;
+      height: 42PX;
+      line-height: 42PX;
+      padding-left:45PX;
+      font-size: 16PX;
+      background: url('@/assets/newImgs/pumpGY/titleBg.png') no-repeat;
+      background-size: 100% 100%;
+    }
+    p{
+      padding-left:20PX;
+    }
+  }
+  .waterFlow{
+    width:725PX;
+    position:absolute;
+    z-index: 10;
+    left:243PX;
+    bottom:28PX;
+  }
+  .realData{
+    color:#fff;
+    p{
+      position:absolute;
+      z-index: 10;
+      width:160PX;
+      height: 26PX;
+      line-height: 26PX;
+      text-align: center;
+      background: #004DE0;
+      border-radius: 13PX;
+      font-size:16PX;
+    }
+  }
+  .waterFX{
+    img{
+      position:absolute;
+      z-index: 10;
+    }
+  }
+}
+</style>