diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/geojson/kaifeng/kaifengNatureWater.json b/src/assets/geojson/kaifeng/kaifengNatureWater.json
index 2ff002f..96b8e61 100644
--- a/src/assets/geojson/kaifeng/kaifengNatureWater.json
+++ b/src/assets/geojson/kaifeng/kaifengNatureWater.json
@@ -1 +1,53 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33464588229256,34.79216861409467]},"properties":{"FID":0,"Id":0,"name":"包公湖（TSBGH），水面面积0.39km²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.34498226090189,34.807130664899333]},"properties":{"FID":1,"Id":0,"name":"龙亭湖（TSLTH），水面面积0.47km²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33693016485816,34.81489722562236]},"properties":{"FID":2,"Id":0,"name":"西北湖（TSXBH），水面面积0.19km²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36736823004473,34.815525403327904]},"properties":{"FID":3,"Id":0,"name":"铁塔湖（TSTTH），水面面积0.08km²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.36234280840043,34.805760095359972]},"properties":{"FID":4,"Id":0,"name":"阳光湖（TSYGH），水面面积0.11km²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.29255797602144,34.800449138394953]},"properties":{"FID":5,"Id":0,"name":"金明池（TSJMC），水面面积0.14km²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.24298904434796,34.807644628476581]},"properties":{"FID":6,"Id":0,"name":"中意湖（TSZYH），水面面积0.15km²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.27488333967011,34.890045363108491]},"properties":{"FID":7,"Id":0,"name":"黑岗口水库（TSHGKSK），水面面积2.78km²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.33464588229256, 34.79216861409467] },
+      "properties": { "FID": 0, "Id": 0, "name": "包公湖\n水面面积0.39km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.34498226090189, 34.807130664899333] },
+      "properties": { "FID": 1, "Id": 0, "name": "龙亭湖\n水面面积0.47km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.33693016485816, 34.81489722562236] },
+      "properties": { "FID": 2, "Id": 0, "name": "西北湖\n水面面积0.19km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.36736823004473, 34.815525403327904] },
+      "properties": { "FID": 3, "Id": 0, "name": "铁塔湖\n水面面积0.08km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.36234280840043, 34.805760095359972] },
+      "properties": { "FID": 4, "Id": 0, "name": "阳光湖\n水面面积0.11km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.29255797602144, 34.800449138394953] },
+      "properties": { "FID": 5, "Id": 0, "name": "金明池\n水面面积0.14km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.24298904434796, 34.807644628476581] },
+      "properties": { "FID": 6, "Id": 0, "name": "中意湖\n水面面积0.15km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.27488333967011, 34.890045363108491] },
+      "properties": { "FID": 7, "Id": 0, "name": "黑岗口水库\n水面面积2.78km²" }
+    }
+  ]
+}

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/geojson/kaifeng/kaifengNatureWater.json b/src/assets/geojson/kaifeng/kaifengNatureWater.json
index 2ff002f..96b8e61 100644
--- a/src/assets/geojson/kaifeng/kaifengNatureWater.json
+++ b/src/assets/geojson/kaifeng/kaifengNatureWater.json
@@ -1 +1,53 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33464588229256,34.79216861409467]},"properties":{"FID":0,"Id":0,"name":"包公湖（TSBGH），水面面积0.39km²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.34498226090189,34.807130664899333]},"properties":{"FID":1,"Id":0,"name":"龙亭湖（TSLTH），水面面积0.47km²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33693016485816,34.81489722562236]},"properties":{"FID":2,"Id":0,"name":"西北湖（TSXBH），水面面积0.19km²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36736823004473,34.815525403327904]},"properties":{"FID":3,"Id":0,"name":"铁塔湖（TSTTH），水面面积0.08km²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.36234280840043,34.805760095359972]},"properties":{"FID":4,"Id":0,"name":"阳光湖（TSYGH），水面面积0.11km²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.29255797602144,34.800449138394953]},"properties":{"FID":5,"Id":0,"name":"金明池（TSJMC），水面面积0.14km²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.24298904434796,34.807644628476581]},"properties":{"FID":6,"Id":0,"name":"中意湖（TSZYH），水面面积0.15km²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.27488333967011,34.890045363108491]},"properties":{"FID":7,"Id":0,"name":"黑岗口水库（TSHGKSK），水面面积2.78km²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.33464588229256, 34.79216861409467] },
+      "properties": { "FID": 0, "Id": 0, "name": "包公湖\n水面面积0.39km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.34498226090189, 34.807130664899333] },
+      "properties": { "FID": 1, "Id": 0, "name": "龙亭湖\n水面面积0.47km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.33693016485816, 34.81489722562236] },
+      "properties": { "FID": 2, "Id": 0, "name": "西北湖\n水面面积0.19km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.36736823004473, 34.815525403327904] },
+      "properties": { "FID": 3, "Id": 0, "name": "铁塔湖\n水面面积0.08km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.36234280840043, 34.805760095359972] },
+      "properties": { "FID": 4, "Id": 0, "name": "阳光湖\n水面面积0.11km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.29255797602144, 34.800449138394953] },
+      "properties": { "FID": 5, "Id": 0, "name": "金明池\n水面面积0.14km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.24298904434796, 34.807644628476581] },
+      "properties": { "FID": 6, "Id": 0, "name": "中意湖\n水面面积0.15km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.27488333967011, 34.890045363108491] },
+      "properties": { "FID": 7, "Id": 0, "name": "黑岗口水库\n水面面积2.78km²" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengRainUse.json b/src/assets/geojson/kaifeng/kaifengRainUse.json
index 58596f7..3b691da 100644
--- a/src/assets/geojson/kaifeng/kaifengRainUse.json
+++ b/src/assets/geojson/kaifeng/kaifengRainUse.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.34471576126923,34.807244879027621]},"properties":{"FID":0,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.33672077228964,34.815144689566978]},"properties":{"FID":1,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.29246279758119,34.80039203133083]},"properties":{"FID":2,"Id":0,"name":"金明池，汇水面积0.17km²，收集雨水2.7万吨/年"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.24277965177946,34.807530414348321]},"properties":{"FID":3,"Id":0,"name":"中意湖，汇水面积0.22km²，收集雨水3.5万吨/年"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.34471576126923, 34.807244879027621] },
+      "properties": { "FID": 0, "Id": 0, "name": "龙亭湖，汇水面积0.28km²\n收集雨水4.5万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.33672077228964, 34.815144689566978] },
+      "properties": { "FID": 1, "Id": 0, "name": "西北湖，汇水面积0.14km²\n收集雨水2.2万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.29246279758119, 34.80039203133083] },
+      "properties": { "FID": 2, "Id": 0, "name": "金明池，汇水面积0.17km²\n收集雨水2.7万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.24277965177946, 34.807530414348321] },
+      "properties": { "FID": 3, "Id": 0, "name": "中意湖，汇水面积0.22km²\n收集雨水3.5万吨/年" }
+    }
+  ]
+}

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/geojson/kaifeng/kaifengNatureWater.json b/src/assets/geojson/kaifeng/kaifengNatureWater.json
index 2ff002f..96b8e61 100644
--- a/src/assets/geojson/kaifeng/kaifengNatureWater.json
+++ b/src/assets/geojson/kaifeng/kaifengNatureWater.json
@@ -1 +1,53 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33464588229256,34.79216861409467]},"properties":{"FID":0,"Id":0,"name":"包公湖（TSBGH），水面面积0.39km²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.34498226090189,34.807130664899333]},"properties":{"FID":1,"Id":0,"name":"龙亭湖（TSLTH），水面面积0.47km²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33693016485816,34.81489722562236]},"properties":{"FID":2,"Id":0,"name":"西北湖（TSXBH），水面面积0.19km²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36736823004473,34.815525403327904]},"properties":{"FID":3,"Id":0,"name":"铁塔湖（TSTTH），水面面积0.08km²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.36234280840043,34.805760095359972]},"properties":{"FID":4,"Id":0,"name":"阳光湖（TSYGH），水面面积0.11km²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.29255797602144,34.800449138394953]},"properties":{"FID":5,"Id":0,"name":"金明池（TSJMC），水面面积0.14km²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.24298904434796,34.807644628476581]},"properties":{"FID":6,"Id":0,"name":"中意湖（TSZYH），水面面积0.15km²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.27488333967011,34.890045363108491]},"properties":{"FID":7,"Id":0,"name":"黑岗口水库（TSHGKSK），水面面积2.78km²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.33464588229256, 34.79216861409467] },
+      "properties": { "FID": 0, "Id": 0, "name": "包公湖\n水面面积0.39km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.34498226090189, 34.807130664899333] },
+      "properties": { "FID": 1, "Id": 0, "name": "龙亭湖\n水面面积0.47km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.33693016485816, 34.81489722562236] },
+      "properties": { "FID": 2, "Id": 0, "name": "西北湖\n水面面积0.19km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.36736823004473, 34.815525403327904] },
+      "properties": { "FID": 3, "Id": 0, "name": "铁塔湖\n水面面积0.08km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.36234280840043, 34.805760095359972] },
+      "properties": { "FID": 4, "Id": 0, "name": "阳光湖\n水面面积0.11km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.29255797602144, 34.800449138394953] },
+      "properties": { "FID": 5, "Id": 0, "name": "金明池\n水面面积0.14km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.24298904434796, 34.807644628476581] },
+      "properties": { "FID": 6, "Id": 0, "name": "中意湖\n水面面积0.15km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.27488333967011, 34.890045363108491] },
+      "properties": { "FID": 7, "Id": 0, "name": "黑岗口水库\n水面面积2.78km²" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengRainUse.json b/src/assets/geojson/kaifeng/kaifengRainUse.json
index 58596f7..3b691da 100644
--- a/src/assets/geojson/kaifeng/kaifengRainUse.json
+++ b/src/assets/geojson/kaifeng/kaifengRainUse.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.34471576126923,34.807244879027621]},"properties":{"FID":0,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.33672077228964,34.815144689566978]},"properties":{"FID":1,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.29246279758119,34.80039203133083]},"properties":{"FID":2,"Id":0,"name":"金明池，汇水面积0.17km²，收集雨水2.7万吨/年"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.24277965177946,34.807530414348321]},"properties":{"FID":3,"Id":0,"name":"中意湖，汇水面积0.22km²，收集雨水3.5万吨/年"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.34471576126923, 34.807244879027621] },
+      "properties": { "FID": 0, "Id": 0, "name": "龙亭湖，汇水面积0.28km²\n收集雨水4.5万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.33672077228964, 34.815144689566978] },
+      "properties": { "FID": 1, "Id": 0, "name": "西北湖，汇水面积0.14km²\n收集雨水2.2万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.29246279758119, 34.80039203133083] },
+      "properties": { "FID": 2, "Id": 0, "name": "金明池，汇水面积0.17km²\n收集雨水2.7万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.24277965177946, 34.807530414348321] },
+      "properties": { "FID": 3, "Id": 0, "name": "中意湖，汇水面积0.22km²\n收集雨水3.5万吨/年" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
index 5587963..7b6a3ca 100644
--- a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
+++ b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，实际处理7.54万m³/日"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，实际处理9.7万m³/日"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，实际处理20.7万m³/日"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n实际处理7.54万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n实际处理9.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n实际处理20.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": { "FID": 3, "Id": 0, "name": "祥符区污水处理厂\n设计规模4万m³/日\n实际处理2.63万m³/日" }
+    }
+  ]
+}

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/geojson/kaifeng/kaifengNatureWater.json b/src/assets/geojson/kaifeng/kaifengNatureWater.json
index 2ff002f..96b8e61 100644
--- a/src/assets/geojson/kaifeng/kaifengNatureWater.json
+++ b/src/assets/geojson/kaifeng/kaifengNatureWater.json
@@ -1 +1,53 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33464588229256,34.79216861409467]},"properties":{"FID":0,"Id":0,"name":"包公湖（TSBGH），水面面积0.39km²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.34498226090189,34.807130664899333]},"properties":{"FID":1,"Id":0,"name":"龙亭湖（TSLTH），水面面积0.47km²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33693016485816,34.81489722562236]},"properties":{"FID":2,"Id":0,"name":"西北湖（TSXBH），水面面积0.19km²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36736823004473,34.815525403327904]},"properties":{"FID":3,"Id":0,"name":"铁塔湖（TSTTH），水面面积0.08km²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.36234280840043,34.805760095359972]},"properties":{"FID":4,"Id":0,"name":"阳光湖（TSYGH），水面面积0.11km²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.29255797602144,34.800449138394953]},"properties":{"FID":5,"Id":0,"name":"金明池（TSJMC），水面面积0.14km²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.24298904434796,34.807644628476581]},"properties":{"FID":6,"Id":0,"name":"中意湖（TSZYH），水面面积0.15km²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.27488333967011,34.890045363108491]},"properties":{"FID":7,"Id":0,"name":"黑岗口水库（TSHGKSK），水面面积2.78km²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.33464588229256, 34.79216861409467] },
+      "properties": { "FID": 0, "Id": 0, "name": "包公湖\n水面面积0.39km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.34498226090189, 34.807130664899333] },
+      "properties": { "FID": 1, "Id": 0, "name": "龙亭湖\n水面面积0.47km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.33693016485816, 34.81489722562236] },
+      "properties": { "FID": 2, "Id": 0, "name": "西北湖\n水面面积0.19km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.36736823004473, 34.815525403327904] },
+      "properties": { "FID": 3, "Id": 0, "name": "铁塔湖\n水面面积0.08km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.36234280840043, 34.805760095359972] },
+      "properties": { "FID": 4, "Id": 0, "name": "阳光湖\n水面面积0.11km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.29255797602144, 34.800449138394953] },
+      "properties": { "FID": 5, "Id": 0, "name": "金明池\n水面面积0.14km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.24298904434796, 34.807644628476581] },
+      "properties": { "FID": 6, "Id": 0, "name": "中意湖\n水面面积0.15km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.27488333967011, 34.890045363108491] },
+      "properties": { "FID": 7, "Id": 0, "name": "黑岗口水库\n水面面积2.78km²" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengRainUse.json b/src/assets/geojson/kaifeng/kaifengRainUse.json
index 58596f7..3b691da 100644
--- a/src/assets/geojson/kaifeng/kaifengRainUse.json
+++ b/src/assets/geojson/kaifeng/kaifengRainUse.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.34471576126923,34.807244879027621]},"properties":{"FID":0,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.33672077228964,34.815144689566978]},"properties":{"FID":1,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.29246279758119,34.80039203133083]},"properties":{"FID":2,"Id":0,"name":"金明池，汇水面积0.17km²，收集雨水2.7万吨/年"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.24277965177946,34.807530414348321]},"properties":{"FID":3,"Id":0,"name":"中意湖，汇水面积0.22km²，收集雨水3.5万吨/年"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.34471576126923, 34.807244879027621] },
+      "properties": { "FID": 0, "Id": 0, "name": "龙亭湖，汇水面积0.28km²\n收集雨水4.5万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.33672077228964, 34.815144689566978] },
+      "properties": { "FID": 1, "Id": 0, "name": "西北湖，汇水面积0.14km²\n收集雨水2.2万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.29246279758119, 34.80039203133083] },
+      "properties": { "FID": 2, "Id": 0, "name": "金明池，汇水面积0.17km²\n收集雨水2.7万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.24277965177946, 34.807530414348321] },
+      "properties": { "FID": 3, "Id": 0, "name": "中意湖，汇水面积0.22km²\n收集雨水3.5万吨/年" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
index 5587963..7b6a3ca 100644
--- a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
+++ b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，实际处理7.54万m³/日"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，实际处理9.7万m³/日"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，实际处理20.7万m³/日"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n实际处理7.54万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n实际处理9.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n实际处理20.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": { "FID": 3, "Id": 0, "name": "祥符区污水处理厂\n设计规模4万m³/日\n实际处理2.63万m³/日" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
index 2027bf0..ae6535d 100644
--- a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
+++ b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
@@ -1 +1,65 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3154008016774,34.790398295106343]},"properties":{"FID":0,"Id":0,"name":"2022年示范区老旧小区改造（JZ01），透水铺装面积33970.63m²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32510900258119,34.786020086855615]},"properties":{"FID":1,"Id":0,"name":"环城公园一期城墙西南角绿化（GY01），透水铺装面积2881.53m²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.22945467014681,34.795918644639869]},"properties":{"FID":2,"Id":0,"name":"综合保税产业园区基础设施建设（GY02），透水铺装面积55200m²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.33710148605057,34.813069799569888]},"properties":{"FID":3,"Id":0,"name":"龙亭北路（金耀路—广济河）道路海绵化改造（DL13），透水铺装面积15945m²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.33264713504767,34.813355334890595]},"properties":{"FID":4,"Id":0,"name":"人行道提升改造（DL12），透水铺装面积41715.70m²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.35280592868905,34.781432486036373]},"properties":{"FID":5,"Id":0,"name":"南部片区雨污分流改造（GW04），透水铺装面积15406m²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.37307893645874,34.793367862441613]},"properties":{"FID":6,"Id":0,"name":"汴京路（公园路-工农路）排水管网及道路海绵化改造（GW06），透水铺装面积20325.77m²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.35137825208555,34.775721779622373]},"properties":{"FID":7,"Id":0,"name":"铁路北沿街（解放路—侯庄桥）道路海绵化改造（DL14），透水铺装面积14699.29m²"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.33259002798351,34.778177383380388]},"properties":{"FID":8,"Id":0,"name":"五福路（五一路—中山路）道路海绵化改（DL15），透水铺装面积12567.22m²"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.39792050935961,34.794681324916823]},"properties":{"FID":9,"Id":0,"name":"汴京路东郊沟雨水泵站新建（GW15），透水铺装面积137.05m²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.3154008016774, 34.790398295106343] },
+      "properties": { "FID": 0, "Id": 0, "name": "2022年示范区老旧小区改造\n透水铺装面积33970.63m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.32510900258119, 34.786020086855615] },
+      "properties": { "FID": 1, "Id": 0, "name": "环城公园一期城墙西南角绿化\n透水铺装面积2881.53m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.22945467014681, 34.795918644639869] },
+      "properties": { "FID": 2, "Id": 0, "name": "综合保税产业园区基础设施建设\n透水铺装面积55200m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.33710148605057, 34.813069799569888] },
+      "properties": { "FID": 3, "Id": 0, "name": "龙亭北路道路海绵化改造\n透水铺装面积15945m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.33264713504767, 34.813355334890595] },
+      "properties": { "FID": 4, "Id": 0, "name": "人行道提升改造\n透水铺装面积41715.70m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.35280592868905, 34.781432486036373] },
+      "properties": { "FID": 5, "Id": 0, "name": "南部片区雨污分流改造\n透水铺装面积15406m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.37307893645874, 34.793367862441613] },
+      "properties": { "FID": 6, "Id": 0, "name": "汴京路管网及道路海绵化改造\n透水铺装面积20325.77m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.35137825208555, 34.775721779622373] },
+      "properties": { "FID": 7, "Id": 0, "name": "铁路北沿街道路海绵化改造\n透水铺装面积14699.29m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 8,
+      "geometry": { "type": "Point", "coordinates": [114.33259002798351, 34.778177383380388] },
+      "properties": { "FID": 8, "Id": 0, "name": "五福路道路海绵化改\n透水铺装面积12567.22m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 9,
+      "geometry": { "type": "Point", "coordinates": [114.39792050935961, 34.794681324916823] },
+      "properties": { "FID": 9, "Id": 0, "name": "汴京路东郊沟雨水泵站新建\n透水铺装面积137.05m²" }
+    }
+  ]
+}

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/geojson/kaifeng/kaifengNatureWater.json b/src/assets/geojson/kaifeng/kaifengNatureWater.json
index 2ff002f..96b8e61 100644
--- a/src/assets/geojson/kaifeng/kaifengNatureWater.json
+++ b/src/assets/geojson/kaifeng/kaifengNatureWater.json
@@ -1 +1,53 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33464588229256,34.79216861409467]},"properties":{"FID":0,"Id":0,"name":"包公湖（TSBGH），水面面积0.39km²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.34498226090189,34.807130664899333]},"properties":{"FID":1,"Id":0,"name":"龙亭湖（TSLTH），水面面积0.47km²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33693016485816,34.81489722562236]},"properties":{"FID":2,"Id":0,"name":"西北湖（TSXBH），水面面积0.19km²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36736823004473,34.815525403327904]},"properties":{"FID":3,"Id":0,"name":"铁塔湖（TSTTH），水面面积0.08km²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.36234280840043,34.805760095359972]},"properties":{"FID":4,"Id":0,"name":"阳光湖（TSYGH），水面面积0.11km²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.29255797602144,34.800449138394953]},"properties":{"FID":5,"Id":0,"name":"金明池（TSJMC），水面面积0.14km²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.24298904434796,34.807644628476581]},"properties":{"FID":6,"Id":0,"name":"中意湖（TSZYH），水面面积0.15km²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.27488333967011,34.890045363108491]},"properties":{"FID":7,"Id":0,"name":"黑岗口水库（TSHGKSK），水面面积2.78km²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.33464588229256, 34.79216861409467] },
+      "properties": { "FID": 0, "Id": 0, "name": "包公湖\n水面面积0.39km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.34498226090189, 34.807130664899333] },
+      "properties": { "FID": 1, "Id": 0, "name": "龙亭湖\n水面面积0.47km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.33693016485816, 34.81489722562236] },
+      "properties": { "FID": 2, "Id": 0, "name": "西北湖\n水面面积0.19km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.36736823004473, 34.815525403327904] },
+      "properties": { "FID": 3, "Id": 0, "name": "铁塔湖\n水面面积0.08km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.36234280840043, 34.805760095359972] },
+      "properties": { "FID": 4, "Id": 0, "name": "阳光湖\n水面面积0.11km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.29255797602144, 34.800449138394953] },
+      "properties": { "FID": 5, "Id": 0, "name": "金明池\n水面面积0.14km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.24298904434796, 34.807644628476581] },
+      "properties": { "FID": 6, "Id": 0, "name": "中意湖\n水面面积0.15km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.27488333967011, 34.890045363108491] },
+      "properties": { "FID": 7, "Id": 0, "name": "黑岗口水库\n水面面积2.78km²" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengRainUse.json b/src/assets/geojson/kaifeng/kaifengRainUse.json
index 58596f7..3b691da 100644
--- a/src/assets/geojson/kaifeng/kaifengRainUse.json
+++ b/src/assets/geojson/kaifeng/kaifengRainUse.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.34471576126923,34.807244879027621]},"properties":{"FID":0,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.33672077228964,34.815144689566978]},"properties":{"FID":1,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.29246279758119,34.80039203133083]},"properties":{"FID":2,"Id":0,"name":"金明池，汇水面积0.17km²，收集雨水2.7万吨/年"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.24277965177946,34.807530414348321]},"properties":{"FID":3,"Id":0,"name":"中意湖，汇水面积0.22km²，收集雨水3.5万吨/年"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.34471576126923, 34.807244879027621] },
+      "properties": { "FID": 0, "Id": 0, "name": "龙亭湖，汇水面积0.28km²\n收集雨水4.5万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.33672077228964, 34.815144689566978] },
+      "properties": { "FID": 1, "Id": 0, "name": "西北湖，汇水面积0.14km²\n收集雨水2.2万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.29246279758119, 34.80039203133083] },
+      "properties": { "FID": 2, "Id": 0, "name": "金明池，汇水面积0.17km²\n收集雨水2.7万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.24277965177946, 34.807530414348321] },
+      "properties": { "FID": 3, "Id": 0, "name": "中意湖，汇水面积0.22km²\n收集雨水3.5万吨/年" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
index 5587963..7b6a3ca 100644
--- a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
+++ b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，实际处理7.54万m³/日"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，实际处理9.7万m³/日"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，实际处理20.7万m³/日"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n实际处理7.54万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n实际处理9.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n实际处理20.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": { "FID": 3, "Id": 0, "name": "祥符区污水处理厂\n设计规模4万m³/日\n实际处理2.63万m³/日" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
index 2027bf0..ae6535d 100644
--- a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
+++ b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
@@ -1 +1,65 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3154008016774,34.790398295106343]},"properties":{"FID":0,"Id":0,"name":"2022年示范区老旧小区改造（JZ01），透水铺装面积33970.63m²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32510900258119,34.786020086855615]},"properties":{"FID":1,"Id":0,"name":"环城公园一期城墙西南角绿化（GY01），透水铺装面积2881.53m²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.22945467014681,34.795918644639869]},"properties":{"FID":2,"Id":0,"name":"综合保税产业园区基础设施建设（GY02），透水铺装面积55200m²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.33710148605057,34.813069799569888]},"properties":{"FID":3,"Id":0,"name":"龙亭北路（金耀路—广济河）道路海绵化改造（DL13），透水铺装面积15945m²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.33264713504767,34.813355334890595]},"properties":{"FID":4,"Id":0,"name":"人行道提升改造（DL12），透水铺装面积41715.70m²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.35280592868905,34.781432486036373]},"properties":{"FID":5,"Id":0,"name":"南部片区雨污分流改造（GW04），透水铺装面积15406m²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.37307893645874,34.793367862441613]},"properties":{"FID":6,"Id":0,"name":"汴京路（公园路-工农路）排水管网及道路海绵化改造（GW06），透水铺装面积20325.77m²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.35137825208555,34.775721779622373]},"properties":{"FID":7,"Id":0,"name":"铁路北沿街（解放路—侯庄桥）道路海绵化改造（DL14），透水铺装面积14699.29m²"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.33259002798351,34.778177383380388]},"properties":{"FID":8,"Id":0,"name":"五福路（五一路—中山路）道路海绵化改（DL15），透水铺装面积12567.22m²"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.39792050935961,34.794681324916823]},"properties":{"FID":9,"Id":0,"name":"汴京路东郊沟雨水泵站新建（GW15），透水铺装面积137.05m²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.3154008016774, 34.790398295106343] },
+      "properties": { "FID": 0, "Id": 0, "name": "2022年示范区老旧小区改造\n透水铺装面积33970.63m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.32510900258119, 34.786020086855615] },
+      "properties": { "FID": 1, "Id": 0, "name": "环城公园一期城墙西南角绿化\n透水铺装面积2881.53m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.22945467014681, 34.795918644639869] },
+      "properties": { "FID": 2, "Id": 0, "name": "综合保税产业园区基础设施建设\n透水铺装面积55200m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.33710148605057, 34.813069799569888] },
+      "properties": { "FID": 3, "Id": 0, "name": "龙亭北路道路海绵化改造\n透水铺装面积15945m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.33264713504767, 34.813355334890595] },
+      "properties": { "FID": 4, "Id": 0, "name": "人行道提升改造\n透水铺装面积41715.70m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.35280592868905, 34.781432486036373] },
+      "properties": { "FID": 5, "Id": 0, "name": "南部片区雨污分流改造\n透水铺装面积15406m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.37307893645874, 34.793367862441613] },
+      "properties": { "FID": 6, "Id": 0, "name": "汴京路管网及道路海绵化改造\n透水铺装面积20325.77m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.35137825208555, 34.775721779622373] },
+      "properties": { "FID": 7, "Id": 0, "name": "铁路北沿街道路海绵化改造\n透水铺装面积14699.29m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 8,
+      "geometry": { "type": "Point", "coordinates": [114.33259002798351, 34.778177383380388] },
+      "properties": { "FID": 8, "Id": 0, "name": "五福路道路海绵化改\n透水铺装面积12567.22m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 9,
+      "geometry": { "type": "Point", "coordinates": [114.39792050935961, 34.794681324916823] },
+      "properties": { "FID": 9, "Id": 0, "name": "汴京路东郊沟雨水泵站新建\n透水铺装面积137.05m²" }
+    }
+  ]
+}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index a247296..0955a68 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -117,19 +117,22 @@
       fileIndex = index;
     }
   });
+  uploadList.value.splice(fileIndex, 1);
+  props.saveFileArr.splice(fileIndex, 1);
+
   // id为空时做逻辑删除，不调用删除接口
-  let id = uploadList.value[fileIndex].id;
-  if (!!!id) {
-    uploadList.value.splice(fileIndex, 1);
-    props.saveFileArr.splice(fileIndex, 1);
-  } else {
-    let ids = [];
-    ids.push(id);
-    sysUploadDel(ids).then(res => {
-      uploadList.value.splice(fileIndex, 1);
-      props.saveFileArr.splice(fileIndex, 1);
-    });
-  }
+  // let id = uploadList.value[fileIndex].id;
+  // if (!!!id) {
+  //   uploadList.value.splice(fileIndex, 1);
+  //   props.saveFileArr.splice(fileIndex, 1);
+  // } else {
+  //   let ids = [];
+  //   ids.push(id);
+  //   sysUploadDel(ids).then(res => {
+  //     uploadList.value.splice(fileIndex, 1);
+  //     props.saveFileArr.splice(fileIndex, 1);
+  //   });
+  // }
 };
 // 文件方法预览
 const handlePictureCardPreview = file => {

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/geojson/kaifeng/kaifengNatureWater.json b/src/assets/geojson/kaifeng/kaifengNatureWater.json
index 2ff002f..96b8e61 100644
--- a/src/assets/geojson/kaifeng/kaifengNatureWater.json
+++ b/src/assets/geojson/kaifeng/kaifengNatureWater.json
@@ -1 +1,53 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33464588229256,34.79216861409467]},"properties":{"FID":0,"Id":0,"name":"包公湖（TSBGH），水面面积0.39km²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.34498226090189,34.807130664899333]},"properties":{"FID":1,"Id":0,"name":"龙亭湖（TSLTH），水面面积0.47km²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33693016485816,34.81489722562236]},"properties":{"FID":2,"Id":0,"name":"西北湖（TSXBH），水面面积0.19km²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36736823004473,34.815525403327904]},"properties":{"FID":3,"Id":0,"name":"铁塔湖（TSTTH），水面面积0.08km²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.36234280840043,34.805760095359972]},"properties":{"FID":4,"Id":0,"name":"阳光湖（TSYGH），水面面积0.11km²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.29255797602144,34.800449138394953]},"properties":{"FID":5,"Id":0,"name":"金明池（TSJMC），水面面积0.14km²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.24298904434796,34.807644628476581]},"properties":{"FID":6,"Id":0,"name":"中意湖（TSZYH），水面面积0.15km²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.27488333967011,34.890045363108491]},"properties":{"FID":7,"Id":0,"name":"黑岗口水库（TSHGKSK），水面面积2.78km²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.33464588229256, 34.79216861409467] },
+      "properties": { "FID": 0, "Id": 0, "name": "包公湖\n水面面积0.39km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.34498226090189, 34.807130664899333] },
+      "properties": { "FID": 1, "Id": 0, "name": "龙亭湖\n水面面积0.47km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.33693016485816, 34.81489722562236] },
+      "properties": { "FID": 2, "Id": 0, "name": "西北湖\n水面面积0.19km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.36736823004473, 34.815525403327904] },
+      "properties": { "FID": 3, "Id": 0, "name": "铁塔湖\n水面面积0.08km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.36234280840043, 34.805760095359972] },
+      "properties": { "FID": 4, "Id": 0, "name": "阳光湖\n水面面积0.11km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.29255797602144, 34.800449138394953] },
+      "properties": { "FID": 5, "Id": 0, "name": "金明池\n水面面积0.14km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.24298904434796, 34.807644628476581] },
+      "properties": { "FID": 6, "Id": 0, "name": "中意湖\n水面面积0.15km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.27488333967011, 34.890045363108491] },
+      "properties": { "FID": 7, "Id": 0, "name": "黑岗口水库\n水面面积2.78km²" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengRainUse.json b/src/assets/geojson/kaifeng/kaifengRainUse.json
index 58596f7..3b691da 100644
--- a/src/assets/geojson/kaifeng/kaifengRainUse.json
+++ b/src/assets/geojson/kaifeng/kaifengRainUse.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.34471576126923,34.807244879027621]},"properties":{"FID":0,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.33672077228964,34.815144689566978]},"properties":{"FID":1,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.29246279758119,34.80039203133083]},"properties":{"FID":2,"Id":0,"name":"金明池，汇水面积0.17km²，收集雨水2.7万吨/年"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.24277965177946,34.807530414348321]},"properties":{"FID":3,"Id":0,"name":"中意湖，汇水面积0.22km²，收集雨水3.5万吨/年"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.34471576126923, 34.807244879027621] },
+      "properties": { "FID": 0, "Id": 0, "name": "龙亭湖，汇水面积0.28km²\n收集雨水4.5万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.33672077228964, 34.815144689566978] },
+      "properties": { "FID": 1, "Id": 0, "name": "西北湖，汇水面积0.14km²\n收集雨水2.2万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.29246279758119, 34.80039203133083] },
+      "properties": { "FID": 2, "Id": 0, "name": "金明池，汇水面积0.17km²\n收集雨水2.7万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.24277965177946, 34.807530414348321] },
+      "properties": { "FID": 3, "Id": 0, "name": "中意湖，汇水面积0.22km²\n收集雨水3.5万吨/年" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
index 5587963..7b6a3ca 100644
--- a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
+++ b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，实际处理7.54万m³/日"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，实际处理9.7万m³/日"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，实际处理20.7万m³/日"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n实际处理7.54万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n实际处理9.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n实际处理20.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": { "FID": 3, "Id": 0, "name": "祥符区污水处理厂\n设计规模4万m³/日\n实际处理2.63万m³/日" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
index 2027bf0..ae6535d 100644
--- a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
+++ b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
@@ -1 +1,65 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3154008016774,34.790398295106343]},"properties":{"FID":0,"Id":0,"name":"2022年示范区老旧小区改造（JZ01），透水铺装面积33970.63m²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32510900258119,34.786020086855615]},"properties":{"FID":1,"Id":0,"name":"环城公园一期城墙西南角绿化（GY01），透水铺装面积2881.53m²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.22945467014681,34.795918644639869]},"properties":{"FID":2,"Id":0,"name":"综合保税产业园区基础设施建设（GY02），透水铺装面积55200m²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.33710148605057,34.813069799569888]},"properties":{"FID":3,"Id":0,"name":"龙亭北路（金耀路—广济河）道路海绵化改造（DL13），透水铺装面积15945m²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.33264713504767,34.813355334890595]},"properties":{"FID":4,"Id":0,"name":"人行道提升改造（DL12），透水铺装面积41715.70m²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.35280592868905,34.781432486036373]},"properties":{"FID":5,"Id":0,"name":"南部片区雨污分流改造（GW04），透水铺装面积15406m²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.37307893645874,34.793367862441613]},"properties":{"FID":6,"Id":0,"name":"汴京路（公园路-工农路）排水管网及道路海绵化改造（GW06），透水铺装面积20325.77m²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.35137825208555,34.775721779622373]},"properties":{"FID":7,"Id":0,"name":"铁路北沿街（解放路—侯庄桥）道路海绵化改造（DL14），透水铺装面积14699.29m²"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.33259002798351,34.778177383380388]},"properties":{"FID":8,"Id":0,"name":"五福路（五一路—中山路）道路海绵化改（DL15），透水铺装面积12567.22m²"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.39792050935961,34.794681324916823]},"properties":{"FID":9,"Id":0,"name":"汴京路东郊沟雨水泵站新建（GW15），透水铺装面积137.05m²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.3154008016774, 34.790398295106343] },
+      "properties": { "FID": 0, "Id": 0, "name": "2022年示范区老旧小区改造\n透水铺装面积33970.63m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.32510900258119, 34.786020086855615] },
+      "properties": { "FID": 1, "Id": 0, "name": "环城公园一期城墙西南角绿化\n透水铺装面积2881.53m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.22945467014681, 34.795918644639869] },
+      "properties": { "FID": 2, "Id": 0, "name": "综合保税产业园区基础设施建设\n透水铺装面积55200m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.33710148605057, 34.813069799569888] },
+      "properties": { "FID": 3, "Id": 0, "name": "龙亭北路道路海绵化改造\n透水铺装面积15945m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.33264713504767, 34.813355334890595] },
+      "properties": { "FID": 4, "Id": 0, "name": "人行道提升改造\n透水铺装面积41715.70m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.35280592868905, 34.781432486036373] },
+      "properties": { "FID": 5, "Id": 0, "name": "南部片区雨污分流改造\n透水铺装面积15406m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.37307893645874, 34.793367862441613] },
+      "properties": { "FID": 6, "Id": 0, "name": "汴京路管网及道路海绵化改造\n透水铺装面积20325.77m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.35137825208555, 34.775721779622373] },
+      "properties": { "FID": 7, "Id": 0, "name": "铁路北沿街道路海绵化改造\n透水铺装面积14699.29m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 8,
+      "geometry": { "type": "Point", "coordinates": [114.33259002798351, 34.778177383380388] },
+      "properties": { "FID": 8, "Id": 0, "name": "五福路道路海绵化改\n透水铺装面积12567.22m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 9,
+      "geometry": { "type": "Point", "coordinates": [114.39792050935961, 34.794681324916823] },
+      "properties": { "FID": 9, "Id": 0, "name": "汴京路东郊沟雨水泵站新建\n透水铺装面积137.05m²" }
+    }
+  ]
+}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index a247296..0955a68 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -117,19 +117,22 @@
       fileIndex = index;
     }
   });
+  uploadList.value.splice(fileIndex, 1);
+  props.saveFileArr.splice(fileIndex, 1);
+
   // id为空时做逻辑删除，不调用删除接口
-  let id = uploadList.value[fileIndex].id;
-  if (!!!id) {
-    uploadList.value.splice(fileIndex, 1);
-    props.saveFileArr.splice(fileIndex, 1);
-  } else {
-    let ids = [];
-    ids.push(id);
-    sysUploadDel(ids).then(res => {
-      uploadList.value.splice(fileIndex, 1);
-      props.saveFileArr.splice(fileIndex, 1);
-    });
-  }
+  // let id = uploadList.value[fileIndex].id;
+  // if (!!!id) {
+  //   uploadList.value.splice(fileIndex, 1);
+  //   props.saveFileArr.splice(fileIndex, 1);
+  // } else {
+  //   let ids = [];
+  //   ids.push(id);
+  //   sysUploadDel(ids).then(res => {
+  //     uploadList.value.splice(fileIndex, 1);
+  //     props.saveFileArr.splice(fileIndex, 1);
+  //   });
+  // }
 };
 // 文件方法预览
 const handlePictureCardPreview = file => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 1707a00..e81aac9 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -178,7 +178,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(3);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/geojson/kaifeng/kaifengNatureWater.json b/src/assets/geojson/kaifeng/kaifengNatureWater.json
index 2ff002f..96b8e61 100644
--- a/src/assets/geojson/kaifeng/kaifengNatureWater.json
+++ b/src/assets/geojson/kaifeng/kaifengNatureWater.json
@@ -1 +1,53 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33464588229256,34.79216861409467]},"properties":{"FID":0,"Id":0,"name":"包公湖（TSBGH），水面面积0.39km²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.34498226090189,34.807130664899333]},"properties":{"FID":1,"Id":0,"name":"龙亭湖（TSLTH），水面面积0.47km²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33693016485816,34.81489722562236]},"properties":{"FID":2,"Id":0,"name":"西北湖（TSXBH），水面面积0.19km²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36736823004473,34.815525403327904]},"properties":{"FID":3,"Id":0,"name":"铁塔湖（TSTTH），水面面积0.08km²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.36234280840043,34.805760095359972]},"properties":{"FID":4,"Id":0,"name":"阳光湖（TSYGH），水面面积0.11km²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.29255797602144,34.800449138394953]},"properties":{"FID":5,"Id":0,"name":"金明池（TSJMC），水面面积0.14km²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.24298904434796,34.807644628476581]},"properties":{"FID":6,"Id":0,"name":"中意湖（TSZYH），水面面积0.15km²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.27488333967011,34.890045363108491]},"properties":{"FID":7,"Id":0,"name":"黑岗口水库（TSHGKSK），水面面积2.78km²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.33464588229256, 34.79216861409467] },
+      "properties": { "FID": 0, "Id": 0, "name": "包公湖\n水面面积0.39km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.34498226090189, 34.807130664899333] },
+      "properties": { "FID": 1, "Id": 0, "name": "龙亭湖\n水面面积0.47km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.33693016485816, 34.81489722562236] },
+      "properties": { "FID": 2, "Id": 0, "name": "西北湖\n水面面积0.19km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.36736823004473, 34.815525403327904] },
+      "properties": { "FID": 3, "Id": 0, "name": "铁塔湖\n水面面积0.08km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.36234280840043, 34.805760095359972] },
+      "properties": { "FID": 4, "Id": 0, "name": "阳光湖\n水面面积0.11km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.29255797602144, 34.800449138394953] },
+      "properties": { "FID": 5, "Id": 0, "name": "金明池\n水面面积0.14km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.24298904434796, 34.807644628476581] },
+      "properties": { "FID": 6, "Id": 0, "name": "中意湖\n水面面积0.15km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.27488333967011, 34.890045363108491] },
+      "properties": { "FID": 7, "Id": 0, "name": "黑岗口水库\n水面面积2.78km²" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengRainUse.json b/src/assets/geojson/kaifeng/kaifengRainUse.json
index 58596f7..3b691da 100644
--- a/src/assets/geojson/kaifeng/kaifengRainUse.json
+++ b/src/assets/geojson/kaifeng/kaifengRainUse.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.34471576126923,34.807244879027621]},"properties":{"FID":0,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.33672077228964,34.815144689566978]},"properties":{"FID":1,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.29246279758119,34.80039203133083]},"properties":{"FID":2,"Id":0,"name":"金明池，汇水面积0.17km²，收集雨水2.7万吨/年"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.24277965177946,34.807530414348321]},"properties":{"FID":3,"Id":0,"name":"中意湖，汇水面积0.22km²，收集雨水3.5万吨/年"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.34471576126923, 34.807244879027621] },
+      "properties": { "FID": 0, "Id": 0, "name": "龙亭湖，汇水面积0.28km²\n收集雨水4.5万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.33672077228964, 34.815144689566978] },
+      "properties": { "FID": 1, "Id": 0, "name": "西北湖，汇水面积0.14km²\n收集雨水2.2万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.29246279758119, 34.80039203133083] },
+      "properties": { "FID": 2, "Id": 0, "name": "金明池，汇水面积0.17km²\n收集雨水2.7万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.24277965177946, 34.807530414348321] },
+      "properties": { "FID": 3, "Id": 0, "name": "中意湖，汇水面积0.22km²\n收集雨水3.5万吨/年" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
index 5587963..7b6a3ca 100644
--- a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
+++ b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，实际处理7.54万m³/日"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，实际处理9.7万m³/日"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，实际处理20.7万m³/日"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n实际处理7.54万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n实际处理9.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n实际处理20.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": { "FID": 3, "Id": 0, "name": "祥符区污水处理厂\n设计规模4万m³/日\n实际处理2.63万m³/日" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
index 2027bf0..ae6535d 100644
--- a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
+++ b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
@@ -1 +1,65 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3154008016774,34.790398295106343]},"properties":{"FID":0,"Id":0,"name":"2022年示范区老旧小区改造（JZ01），透水铺装面积33970.63m²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32510900258119,34.786020086855615]},"properties":{"FID":1,"Id":0,"name":"环城公园一期城墙西南角绿化（GY01），透水铺装面积2881.53m²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.22945467014681,34.795918644639869]},"properties":{"FID":2,"Id":0,"name":"综合保税产业园区基础设施建设（GY02），透水铺装面积55200m²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.33710148605057,34.813069799569888]},"properties":{"FID":3,"Id":0,"name":"龙亭北路（金耀路—广济河）道路海绵化改造（DL13），透水铺装面积15945m²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.33264713504767,34.813355334890595]},"properties":{"FID":4,"Id":0,"name":"人行道提升改造（DL12），透水铺装面积41715.70m²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.35280592868905,34.781432486036373]},"properties":{"FID":5,"Id":0,"name":"南部片区雨污分流改造（GW04），透水铺装面积15406m²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.37307893645874,34.793367862441613]},"properties":{"FID":6,"Id":0,"name":"汴京路（公园路-工农路）排水管网及道路海绵化改造（GW06），透水铺装面积20325.77m²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.35137825208555,34.775721779622373]},"properties":{"FID":7,"Id":0,"name":"铁路北沿街（解放路—侯庄桥）道路海绵化改造（DL14），透水铺装面积14699.29m²"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.33259002798351,34.778177383380388]},"properties":{"FID":8,"Id":0,"name":"五福路（五一路—中山路）道路海绵化改（DL15），透水铺装面积12567.22m²"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.39792050935961,34.794681324916823]},"properties":{"FID":9,"Id":0,"name":"汴京路东郊沟雨水泵站新建（GW15），透水铺装面积137.05m²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.3154008016774, 34.790398295106343] },
+      "properties": { "FID": 0, "Id": 0, "name": "2022年示范区老旧小区改造\n透水铺装面积33970.63m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.32510900258119, 34.786020086855615] },
+      "properties": { "FID": 1, "Id": 0, "name": "环城公园一期城墙西南角绿化\n透水铺装面积2881.53m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.22945467014681, 34.795918644639869] },
+      "properties": { "FID": 2, "Id": 0, "name": "综合保税产业园区基础设施建设\n透水铺装面积55200m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.33710148605057, 34.813069799569888] },
+      "properties": { "FID": 3, "Id": 0, "name": "龙亭北路道路海绵化改造\n透水铺装面积15945m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.33264713504767, 34.813355334890595] },
+      "properties": { "FID": 4, "Id": 0, "name": "人行道提升改造\n透水铺装面积41715.70m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.35280592868905, 34.781432486036373] },
+      "properties": { "FID": 5, "Id": 0, "name": "南部片区雨污分流改造\n透水铺装面积15406m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.37307893645874, 34.793367862441613] },
+      "properties": { "FID": 6, "Id": 0, "name": "汴京路管网及道路海绵化改造\n透水铺装面积20325.77m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.35137825208555, 34.775721779622373] },
+      "properties": { "FID": 7, "Id": 0, "name": "铁路北沿街道路海绵化改造\n透水铺装面积14699.29m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 8,
+      "geometry": { "type": "Point", "coordinates": [114.33259002798351, 34.778177383380388] },
+      "properties": { "FID": 8, "Id": 0, "name": "五福路道路海绵化改\n透水铺装面积12567.22m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 9,
+      "geometry": { "type": "Point", "coordinates": [114.39792050935961, 34.794681324916823] },
+      "properties": { "FID": 9, "Id": 0, "name": "汴京路东郊沟雨水泵站新建\n透水铺装面积137.05m²" }
+    }
+  ]
+}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index a247296..0955a68 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -117,19 +117,22 @@
       fileIndex = index;
     }
   });
+  uploadList.value.splice(fileIndex, 1);
+  props.saveFileArr.splice(fileIndex, 1);
+
   // id为空时做逻辑删除，不调用删除接口
-  let id = uploadList.value[fileIndex].id;
-  if (!!!id) {
-    uploadList.value.splice(fileIndex, 1);
-    props.saveFileArr.splice(fileIndex, 1);
-  } else {
-    let ids = [];
-    ids.push(id);
-    sysUploadDel(ids).then(res => {
-      uploadList.value.splice(fileIndex, 1);
-      props.saveFileArr.splice(fileIndex, 1);
-    });
-  }
+  // let id = uploadList.value[fileIndex].id;
+  // if (!!!id) {
+  //   uploadList.value.splice(fileIndex, 1);
+  //   props.saveFileArr.splice(fileIndex, 1);
+  // } else {
+  //   let ids = [];
+  //   ids.push(id);
+  //   sysUploadDel(ids).then(res => {
+  //     uploadList.value.splice(fileIndex, 1);
+  //     props.saveFileArr.splice(fileIndex, 1);
+  //   });
+  // }
 };
 // 文件方法预览
 const handlePictureCardPreview = file => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 1707a00..e81aac9 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -178,7 +178,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(3);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
index 014c2dc..97c9878 100644
--- a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
@@ -48,11 +48,6 @@
 import bus from '@/bus';
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 import kaifengFangHong from '@/assets/geojson/kaifeng/kaifengFangHong.json'; //防洪标准
-import kaifengRainUse from '@/assets/geojson/kaifeng/kaifengRainUse.json'; //雨水利用
-import kaifengTouShuiArea from '@/assets/geojson/kaifeng/kaifengTouShuiArea.json'; //透水面积
-import kaifengNatureWater from '@/assets/geojson/kaifeng/kaifengNatureWater.json'; //天然水域
-import kaifengShengHuoWS from '@/assets/geojson/kaifeng/kaifengShengHuoWS.json'; //生活污水
-import kaifengBOD from '@/assets/geojson/kaifeng/kaifengBOD.json'; //进水BOD
 import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
 import tuLi72X from '@/assets/newImgs/tuLi72X.png';
 
@@ -63,81 +58,50 @@
   { id: 'nlxc', name: '内涝消除' },
 ]);
 
-const curTab = ref('fhbz');
+const curTab = ref('');
 const quotaInfo = ref({ isCompliance: 1 }); //改造措施数据
 const tableData = ref([]);
 
 const tabClick = item => {
-  bus.emit('closeAllLayer');
   curTab.value = item.id;
-  if (curTab.value == 'fhbz') {
-    bus.emit('jhkhclick', 'fhbz');
-    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengFangHong', kaifengFangHong, tuLi72X, 20, 1); //图层名、图层geojson，图标，标注每行多少个字，行间距
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  } else if (curTab.value == 'nlbz') {
-    bus.emit('jhkhclick', 'nlbz');
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: false,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  } else {
-    bus.emit('jhkhclick', 'nlxc');
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: false,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  }
   getjb();
   getkhzn();
+  bus.emit('removeKHLayer'); //清除图层
+  if (curTab.value == 'fhbz') {
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengFangHong', kaifengFangHong, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.315, 34.802],
+        zoom: 11.2,
+      });
+    }, 1000);
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: true },
+      { layername: 'cesiumPaishuiArea2', show: true },
+    ]);
+  } else if (curTab.value == 'nlbz') {
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: true },
+      { layername: 'cesiumPaishuiArea2', show: false },
+    ]);
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.315, 34.802],
+        zoom: 11.2,
+      });
+    }, 200);
+  } else {
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: false },
+      { layername: 'cesiumPaishuiArea2', show: true },
+    ]);
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.295, 34.822],
+        zoom: 11.8,
+      });
+    }, 200);
+  }
 };
 
 // 产出绩效公共指标信息
@@ -158,21 +122,13 @@
   });
   if (res && res.code == 200) {
     tableData.value = res.data;
-    console.log('-----', tableData.value);
   }
 }
-//删除图层
-const removeSelectedLayer = layerList => {
-  layerList.forEach(element => {
-    if (newfiberMapbox.map.hasImage(element)) {
-      newfiberMapbox.map.removeImage(element);
-      newfiberMapBoxVectorLayer.removeByIds([element]);
-    }
-  });
-};
+
 onMounted(() => {
-  getjb();
-  getkhzn();
+  setTimeout(() => {
+    tabClick(tabList.value[0]);
+  });
 });
 </script>
 <style lang="scss" scoped>

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/geojson/kaifeng/kaifengNatureWater.json b/src/assets/geojson/kaifeng/kaifengNatureWater.json
index 2ff002f..96b8e61 100644
--- a/src/assets/geojson/kaifeng/kaifengNatureWater.json
+++ b/src/assets/geojson/kaifeng/kaifengNatureWater.json
@@ -1 +1,53 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33464588229256,34.79216861409467]},"properties":{"FID":0,"Id":0,"name":"包公湖（TSBGH），水面面积0.39km²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.34498226090189,34.807130664899333]},"properties":{"FID":1,"Id":0,"name":"龙亭湖（TSLTH），水面面积0.47km²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33693016485816,34.81489722562236]},"properties":{"FID":2,"Id":0,"name":"西北湖（TSXBH），水面面积0.19km²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36736823004473,34.815525403327904]},"properties":{"FID":3,"Id":0,"name":"铁塔湖（TSTTH），水面面积0.08km²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.36234280840043,34.805760095359972]},"properties":{"FID":4,"Id":0,"name":"阳光湖（TSYGH），水面面积0.11km²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.29255797602144,34.800449138394953]},"properties":{"FID":5,"Id":0,"name":"金明池（TSJMC），水面面积0.14km²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.24298904434796,34.807644628476581]},"properties":{"FID":6,"Id":0,"name":"中意湖（TSZYH），水面面积0.15km²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.27488333967011,34.890045363108491]},"properties":{"FID":7,"Id":0,"name":"黑岗口水库（TSHGKSK），水面面积2.78km²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.33464588229256, 34.79216861409467] },
+      "properties": { "FID": 0, "Id": 0, "name": "包公湖\n水面面积0.39km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.34498226090189, 34.807130664899333] },
+      "properties": { "FID": 1, "Id": 0, "name": "龙亭湖\n水面面积0.47km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.33693016485816, 34.81489722562236] },
+      "properties": { "FID": 2, "Id": 0, "name": "西北湖\n水面面积0.19km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.36736823004473, 34.815525403327904] },
+      "properties": { "FID": 3, "Id": 0, "name": "铁塔湖\n水面面积0.08km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.36234280840043, 34.805760095359972] },
+      "properties": { "FID": 4, "Id": 0, "name": "阳光湖\n水面面积0.11km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.29255797602144, 34.800449138394953] },
+      "properties": { "FID": 5, "Id": 0, "name": "金明池\n水面面积0.14km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.24298904434796, 34.807644628476581] },
+      "properties": { "FID": 6, "Id": 0, "name": "中意湖\n水面面积0.15km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.27488333967011, 34.890045363108491] },
+      "properties": { "FID": 7, "Id": 0, "name": "黑岗口水库\n水面面积2.78km²" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengRainUse.json b/src/assets/geojson/kaifeng/kaifengRainUse.json
index 58596f7..3b691da 100644
--- a/src/assets/geojson/kaifeng/kaifengRainUse.json
+++ b/src/assets/geojson/kaifeng/kaifengRainUse.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.34471576126923,34.807244879027621]},"properties":{"FID":0,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.33672077228964,34.815144689566978]},"properties":{"FID":1,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.29246279758119,34.80039203133083]},"properties":{"FID":2,"Id":0,"name":"金明池，汇水面积0.17km²，收集雨水2.7万吨/年"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.24277965177946,34.807530414348321]},"properties":{"FID":3,"Id":0,"name":"中意湖，汇水面积0.22km²，收集雨水3.5万吨/年"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.34471576126923, 34.807244879027621] },
+      "properties": { "FID": 0, "Id": 0, "name": "龙亭湖，汇水面积0.28km²\n收集雨水4.5万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.33672077228964, 34.815144689566978] },
+      "properties": { "FID": 1, "Id": 0, "name": "西北湖，汇水面积0.14km²\n收集雨水2.2万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.29246279758119, 34.80039203133083] },
+      "properties": { "FID": 2, "Id": 0, "name": "金明池，汇水面积0.17km²\n收集雨水2.7万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.24277965177946, 34.807530414348321] },
+      "properties": { "FID": 3, "Id": 0, "name": "中意湖，汇水面积0.22km²\n收集雨水3.5万吨/年" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
index 5587963..7b6a3ca 100644
--- a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
+++ b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，实际处理7.54万m³/日"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，实际处理9.7万m³/日"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，实际处理20.7万m³/日"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n实际处理7.54万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n实际处理9.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n实际处理20.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": { "FID": 3, "Id": 0, "name": "祥符区污水处理厂\n设计规模4万m³/日\n实际处理2.63万m³/日" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
index 2027bf0..ae6535d 100644
--- a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
+++ b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
@@ -1 +1,65 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3154008016774,34.790398295106343]},"properties":{"FID":0,"Id":0,"name":"2022年示范区老旧小区改造（JZ01），透水铺装面积33970.63m²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32510900258119,34.786020086855615]},"properties":{"FID":1,"Id":0,"name":"环城公园一期城墙西南角绿化（GY01），透水铺装面积2881.53m²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.22945467014681,34.795918644639869]},"properties":{"FID":2,"Id":0,"name":"综合保税产业园区基础设施建设（GY02），透水铺装面积55200m²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.33710148605057,34.813069799569888]},"properties":{"FID":3,"Id":0,"name":"龙亭北路（金耀路—广济河）道路海绵化改造（DL13），透水铺装面积15945m²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.33264713504767,34.813355334890595]},"properties":{"FID":4,"Id":0,"name":"人行道提升改造（DL12），透水铺装面积41715.70m²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.35280592868905,34.781432486036373]},"properties":{"FID":5,"Id":0,"name":"南部片区雨污分流改造（GW04），透水铺装面积15406m²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.37307893645874,34.793367862441613]},"properties":{"FID":6,"Id":0,"name":"汴京路（公园路-工农路）排水管网及道路海绵化改造（GW06），透水铺装面积20325.77m²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.35137825208555,34.775721779622373]},"properties":{"FID":7,"Id":0,"name":"铁路北沿街（解放路—侯庄桥）道路海绵化改造（DL14），透水铺装面积14699.29m²"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.33259002798351,34.778177383380388]},"properties":{"FID":8,"Id":0,"name":"五福路（五一路—中山路）道路海绵化改（DL15），透水铺装面积12567.22m²"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.39792050935961,34.794681324916823]},"properties":{"FID":9,"Id":0,"name":"汴京路东郊沟雨水泵站新建（GW15），透水铺装面积137.05m²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.3154008016774, 34.790398295106343] },
+      "properties": { "FID": 0, "Id": 0, "name": "2022年示范区老旧小区改造\n透水铺装面积33970.63m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.32510900258119, 34.786020086855615] },
+      "properties": { "FID": 1, "Id": 0, "name": "环城公园一期城墙西南角绿化\n透水铺装面积2881.53m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.22945467014681, 34.795918644639869] },
+      "properties": { "FID": 2, "Id": 0, "name": "综合保税产业园区基础设施建设\n透水铺装面积55200m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.33710148605057, 34.813069799569888] },
+      "properties": { "FID": 3, "Id": 0, "name": "龙亭北路道路海绵化改造\n透水铺装面积15945m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.33264713504767, 34.813355334890595] },
+      "properties": { "FID": 4, "Id": 0, "name": "人行道提升改造\n透水铺装面积41715.70m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.35280592868905, 34.781432486036373] },
+      "properties": { "FID": 5, "Id": 0, "name": "南部片区雨污分流改造\n透水铺装面积15406m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.37307893645874, 34.793367862441613] },
+      "properties": { "FID": 6, "Id": 0, "name": "汴京路管网及道路海绵化改造\n透水铺装面积20325.77m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.35137825208555, 34.775721779622373] },
+      "properties": { "FID": 7, "Id": 0, "name": "铁路北沿街道路海绵化改造\n透水铺装面积14699.29m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 8,
+      "geometry": { "type": "Point", "coordinates": [114.33259002798351, 34.778177383380388] },
+      "properties": { "FID": 8, "Id": 0, "name": "五福路道路海绵化改\n透水铺装面积12567.22m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 9,
+      "geometry": { "type": "Point", "coordinates": [114.39792050935961, 34.794681324916823] },
+      "properties": { "FID": 9, "Id": 0, "name": "汴京路东郊沟雨水泵站新建\n透水铺装面积137.05m²" }
+    }
+  ]
+}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index a247296..0955a68 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -117,19 +117,22 @@
       fileIndex = index;
     }
   });
+  uploadList.value.splice(fileIndex, 1);
+  props.saveFileArr.splice(fileIndex, 1);
+
   // id为空时做逻辑删除，不调用删除接口
-  let id = uploadList.value[fileIndex].id;
-  if (!!!id) {
-    uploadList.value.splice(fileIndex, 1);
-    props.saveFileArr.splice(fileIndex, 1);
-  } else {
-    let ids = [];
-    ids.push(id);
-    sysUploadDel(ids).then(res => {
-      uploadList.value.splice(fileIndex, 1);
-      props.saveFileArr.splice(fileIndex, 1);
-    });
-  }
+  // let id = uploadList.value[fileIndex].id;
+  // if (!!!id) {
+  //   uploadList.value.splice(fileIndex, 1);
+  //   props.saveFileArr.splice(fileIndex, 1);
+  // } else {
+  //   let ids = [];
+  //   ids.push(id);
+  //   sysUploadDel(ids).then(res => {
+  //     uploadList.value.splice(fileIndex, 1);
+  //     props.saveFileArr.splice(fileIndex, 1);
+  //   });
+  // }
 };
 // 文件方法预览
 const handlePictureCardPreview = file => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 1707a00..e81aac9 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -178,7 +178,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(3);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
index 014c2dc..97c9878 100644
--- a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
@@ -48,11 +48,6 @@
 import bus from '@/bus';
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 import kaifengFangHong from '@/assets/geojson/kaifeng/kaifengFangHong.json'; //防洪标准
-import kaifengRainUse from '@/assets/geojson/kaifeng/kaifengRainUse.json'; //雨水利用
-import kaifengTouShuiArea from '@/assets/geojson/kaifeng/kaifengTouShuiArea.json'; //透水面积
-import kaifengNatureWater from '@/assets/geojson/kaifeng/kaifengNatureWater.json'; //天然水域
-import kaifengShengHuoWS from '@/assets/geojson/kaifeng/kaifengShengHuoWS.json'; //生活污水
-import kaifengBOD from '@/assets/geojson/kaifeng/kaifengBOD.json'; //进水BOD
 import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
 import tuLi72X from '@/assets/newImgs/tuLi72X.png';
 
@@ -63,81 +58,50 @@
   { id: 'nlxc', name: '内涝消除' },
 ]);
 
-const curTab = ref('fhbz');
+const curTab = ref('');
 const quotaInfo = ref({ isCompliance: 1 }); //改造措施数据
 const tableData = ref([]);
 
 const tabClick = item => {
-  bus.emit('closeAllLayer');
   curTab.value = item.id;
-  if (curTab.value == 'fhbz') {
-    bus.emit('jhkhclick', 'fhbz');
-    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengFangHong', kaifengFangHong, tuLi72X, 20, 1); //图层名、图层geojson，图标，标注每行多少个字，行间距
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  } else if (curTab.value == 'nlbz') {
-    bus.emit('jhkhclick', 'nlbz');
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: false,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  } else {
-    bus.emit('jhkhclick', 'nlxc');
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: false,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  }
   getjb();
   getkhzn();
+  bus.emit('removeKHLayer'); //清除图层
+  if (curTab.value == 'fhbz') {
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengFangHong', kaifengFangHong, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.315, 34.802],
+        zoom: 11.2,
+      });
+    }, 1000);
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: true },
+      { layername: 'cesiumPaishuiArea2', show: true },
+    ]);
+  } else if (curTab.value == 'nlbz') {
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: true },
+      { layername: 'cesiumPaishuiArea2', show: false },
+    ]);
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.315, 34.802],
+        zoom: 11.2,
+      });
+    }, 200);
+  } else {
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: false },
+      { layername: 'cesiumPaishuiArea2', show: true },
+    ]);
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.295, 34.822],
+        zoom: 11.8,
+      });
+    }, 200);
+  }
 };
 
 // 产出绩效公共指标信息
@@ -158,21 +122,13 @@
   });
   if (res && res.code == 200) {
     tableData.value = res.data;
-    console.log('-----', tableData.value);
   }
 }
-//删除图层
-const removeSelectedLayer = layerList => {
-  layerList.forEach(element => {
-    if (newfiberMapbox.map.hasImage(element)) {
-      newfiberMapbox.map.removeImage(element);
-      newfiberMapBoxVectorLayer.removeByIds([element]);
-    }
-  });
-};
+
 onMounted(() => {
-  getjb();
-  getkhzn();
+  setTimeout(() => {
+    tabClick(tabList.value[0]);
+  });
 });
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
index e8cd155..1e3dffd 100644
--- a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
+++ b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
@@ -51,15 +51,65 @@
         </div>
       </div>
     </div>
+
+    <!-- 地图水体点击弹窗 -->
+    <el-dialog v-model="dialogShow" :title="ExamineYearA + blackWaterNameA + '水质监测详情'" append-to-body width="900px">
+      <div class="hcstDialog">
+        <div class="part">
+          <div class="title">透明度(cm)</div>
+          <ChartBar3D :echartData="echartData1" class="chart" :key="refresh1"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">氨氮(mg/L)</div>
+          <ChartBar3D :key="refresh2" :echartData="echartData2" class="chart"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">溶解氧(mg/L)</div>
+          <ChartBar3D :key="refresh3" :echartData="echartData3" class="chart"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">氧化还原电位(mV)</div>
+          <ChartBar3D :echartData="echartData4" class="chart" :key="refresh4"></ChartBar3D>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script setup>
 import bus from '@/bus';
+import { blackWaterInfoList, queryYearStatistic } from '@/api/spongePerformance/prevention';
+import ChartBar3D from '@/views/sponeScreen/Echarts/echartBar3D.vue';
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
-import { blackWaterInfoList } from '@/api/spongePerformance/prevention';
+import kaifengShengHuoWS from '@/assets/geojson/kaifeng/kaifengShengHuoWS.json'; //生活污水
+import kaifengBOD from '@/assets/geojson/kaifeng/kaifengBOD.json'; //进水BOD
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
+import tuLi72X from '@/assets/newImgs/tuLi72X.png';
 
 const { proxy } = getCurrentInstance();
-const hcdatas = ref('');
+const dialogShow = ref(false);
+const ExamineYearA = ref('');
+const blackWaterCodeA = ref('');
+const blackWaterNameA = ref('');
+const refresh1 = ref(1);
+const refresh2 = ref(1);
+const refresh3 = ref(1);
+const refresh4 = ref(1);
+const echartData1 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [126, 162, 119, 86, 113],
+});
+const echartData2 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [0.8, 0.35, 1.12, 0.9, 0.98],
+});
+const echartData3 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [5.4, 13, 9.2, 10.4, 8.9],
+});
+const echartData4 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [126, 162, 119, 86, 113],
+});
 const tabs = ref([
   { id: 1, name: '黑臭水体' },
   { id: 2, name: '生活污水' },
@@ -73,82 +123,36 @@
 
 const tabClick = item => {
   curTab.value = item.id;
+  bus.emit('removeKHLayer'); //清除图层
   if (curTab.value == 1) {
-    bus.emit('jhkhclick', 'hcst');
     type.value = 'hcst';
-    addOdorousWaterBodies();
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    addOdorousWaterBodies(); //黑臭水体图层
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.803],
+        zoom: 11.9,
+      });
+    }, 500);
   } else if (curTab.value == 2) {
     type.value = 'shwssjl';
-    bus.emit('jhkhclick', 'shwssjl');
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    // 生活污水收集率
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengShengHuoWS', kaifengShengHuoWS, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.763],
+        zoom: 11.6,
+      });
+    }, 500);
   } else {
     type.value = 'cqjsbod';
-    bus.emit('jhkhclick', 'cqjsbod');
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    // 进水BOD
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengBOD', kaifengBOD, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.763],
+        zoom: 11.6,
+      });
+    }, 500);
   }
   getjb();
   getkhzn();
@@ -175,18 +179,11 @@
   }
 }
 
-// 黑臭基础信息 地图点击可查看监测详情
-async function getHc() {
-  let res = await blackWaterInfoList();
-  if (res && res.code == 200) {
-    hcdatas.value = res.data;
-  }
-}
 //地图渲染黑臭水体
 const addOdorousWaterBodies = async () => {
   // 飞哥 这=这里
   let params = {
-    examineYear: 2024,
+    examineYear: 2023,
   };
   let res = await blackWaterInfoList(params);
   console.log(res, 'ress');
@@ -242,13 +239,70 @@
     //newfiberMapbox.map.moveLayer('waterLine', 'odorousWaterBodies');
   }
 };
+
+// 点击黑臭水体查看监测指标详情
+const queryYearStatist = async () => {
+  let params = {
+    blackWaterCode: blackWaterCodeA.value,
+    sampleDate: ExamineYearA.value,
+  };
+  const res = await queryYearStatistic(params);
+  refresh1.value++;
+  refresh2.value++;
+  refresh3.value++;
+  refresh4.value++;
+  echartData1.value.xAxis = res.data.datelist;
+  echartData1.value.seriesData = res.data.tralist;
+  echartData2.value.xAxis = res.data.datelist;
+  echartData2.value.seriesData = res.data.nh3nlist;
+  echartData3.value.xAxis = res.data.datelist;
+  echartData3.value.seriesData = res.data.dolist;
+  echartData4.value.xAxis = res.data.datelist;
+  echartData4.value.seriesData = res.data.orplist;
+  // console.log(echartData1.value, '123');
+};
+
 onMounted(() => {
-  // getHc();
   getjb();
   getkhzn();
+  setTimeout(() => {
+    // 地图黑臭水体点击查看监测数据详情
+    newfiberMapbox.map.on('click', 'waterLine', e => {
+      let clickfeature = newfiberMapbox.map
+        .queryRenderedFeatures([
+          [e.point.x - 10 / 2, e.point.y - 10 / 2],
+          [e.point.x + 10 / 2, e.point.y + 10 / 2],
+        ])
+        // .filter(i => i.layer.id == 'odorousWaterBodies' || i.layer.id == 'waterLine');
+        .filter(i => i.layer.id == 'waterLine');
+      dialogShow.value = true;
+      blackWaterCodeA.value = clickfeature[0].properties.blackWaterCode;
+      blackWaterNameA.value = clickfeature[0].properties.blackWaterName;
+
+      queryYearStatist();
+      console.log('clickfeature', '点击事件11', clickfeature);
+      // emits('clicksWaterBodies', clickfeature[0].properties);
+    });
+  }, 5000);
 });
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
+.hcstDialog {
+  display: flex;
+  flex-wrap: wrap;
+  .part {
+    width: 48%;
+    margin-right: 2%;
+    .title {
+      font-size: 18px;
+      font-weight: bold;
+      color: #fff;
+    }
+    .chart {
+      height: 300px !important;
+    }
+  }
+}
 .chanChuJiXiao {
   width: 460px;
 

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/geojson/kaifeng/kaifengNatureWater.json b/src/assets/geojson/kaifeng/kaifengNatureWater.json
index 2ff002f..96b8e61 100644
--- a/src/assets/geojson/kaifeng/kaifengNatureWater.json
+++ b/src/assets/geojson/kaifeng/kaifengNatureWater.json
@@ -1 +1,53 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33464588229256,34.79216861409467]},"properties":{"FID":0,"Id":0,"name":"包公湖（TSBGH），水面面积0.39km²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.34498226090189,34.807130664899333]},"properties":{"FID":1,"Id":0,"name":"龙亭湖（TSLTH），水面面积0.47km²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33693016485816,34.81489722562236]},"properties":{"FID":2,"Id":0,"name":"西北湖（TSXBH），水面面积0.19km²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36736823004473,34.815525403327904]},"properties":{"FID":3,"Id":0,"name":"铁塔湖（TSTTH），水面面积0.08km²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.36234280840043,34.805760095359972]},"properties":{"FID":4,"Id":0,"name":"阳光湖（TSYGH），水面面积0.11km²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.29255797602144,34.800449138394953]},"properties":{"FID":5,"Id":0,"name":"金明池（TSJMC），水面面积0.14km²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.24298904434796,34.807644628476581]},"properties":{"FID":6,"Id":0,"name":"中意湖（TSZYH），水面面积0.15km²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.27488333967011,34.890045363108491]},"properties":{"FID":7,"Id":0,"name":"黑岗口水库（TSHGKSK），水面面积2.78km²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.33464588229256, 34.79216861409467] },
+      "properties": { "FID": 0, "Id": 0, "name": "包公湖\n水面面积0.39km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.34498226090189, 34.807130664899333] },
+      "properties": { "FID": 1, "Id": 0, "name": "龙亭湖\n水面面积0.47km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.33693016485816, 34.81489722562236] },
+      "properties": { "FID": 2, "Id": 0, "name": "西北湖\n水面面积0.19km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.36736823004473, 34.815525403327904] },
+      "properties": { "FID": 3, "Id": 0, "name": "铁塔湖\n水面面积0.08km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.36234280840043, 34.805760095359972] },
+      "properties": { "FID": 4, "Id": 0, "name": "阳光湖\n水面面积0.11km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.29255797602144, 34.800449138394953] },
+      "properties": { "FID": 5, "Id": 0, "name": "金明池\n水面面积0.14km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.24298904434796, 34.807644628476581] },
+      "properties": { "FID": 6, "Id": 0, "name": "中意湖\n水面面积0.15km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.27488333967011, 34.890045363108491] },
+      "properties": { "FID": 7, "Id": 0, "name": "黑岗口水库\n水面面积2.78km²" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengRainUse.json b/src/assets/geojson/kaifeng/kaifengRainUse.json
index 58596f7..3b691da 100644
--- a/src/assets/geojson/kaifeng/kaifengRainUse.json
+++ b/src/assets/geojson/kaifeng/kaifengRainUse.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.34471576126923,34.807244879027621]},"properties":{"FID":0,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.33672077228964,34.815144689566978]},"properties":{"FID":1,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.29246279758119,34.80039203133083]},"properties":{"FID":2,"Id":0,"name":"金明池，汇水面积0.17km²，收集雨水2.7万吨/年"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.24277965177946,34.807530414348321]},"properties":{"FID":3,"Id":0,"name":"中意湖，汇水面积0.22km²，收集雨水3.5万吨/年"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.34471576126923, 34.807244879027621] },
+      "properties": { "FID": 0, "Id": 0, "name": "龙亭湖，汇水面积0.28km²\n收集雨水4.5万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.33672077228964, 34.815144689566978] },
+      "properties": { "FID": 1, "Id": 0, "name": "西北湖，汇水面积0.14km²\n收集雨水2.2万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.29246279758119, 34.80039203133083] },
+      "properties": { "FID": 2, "Id": 0, "name": "金明池，汇水面积0.17km²\n收集雨水2.7万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.24277965177946, 34.807530414348321] },
+      "properties": { "FID": 3, "Id": 0, "name": "中意湖，汇水面积0.22km²\n收集雨水3.5万吨/年" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
index 5587963..7b6a3ca 100644
--- a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
+++ b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，实际处理7.54万m³/日"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，实际处理9.7万m³/日"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，实际处理20.7万m³/日"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n实际处理7.54万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n实际处理9.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n实际处理20.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": { "FID": 3, "Id": 0, "name": "祥符区污水处理厂\n设计规模4万m³/日\n实际处理2.63万m³/日" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
index 2027bf0..ae6535d 100644
--- a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
+++ b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
@@ -1 +1,65 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3154008016774,34.790398295106343]},"properties":{"FID":0,"Id":0,"name":"2022年示范区老旧小区改造（JZ01），透水铺装面积33970.63m²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32510900258119,34.786020086855615]},"properties":{"FID":1,"Id":0,"name":"环城公园一期城墙西南角绿化（GY01），透水铺装面积2881.53m²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.22945467014681,34.795918644639869]},"properties":{"FID":2,"Id":0,"name":"综合保税产业园区基础设施建设（GY02），透水铺装面积55200m²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.33710148605057,34.813069799569888]},"properties":{"FID":3,"Id":0,"name":"龙亭北路（金耀路—广济河）道路海绵化改造（DL13），透水铺装面积15945m²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.33264713504767,34.813355334890595]},"properties":{"FID":4,"Id":0,"name":"人行道提升改造（DL12），透水铺装面积41715.70m²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.35280592868905,34.781432486036373]},"properties":{"FID":5,"Id":0,"name":"南部片区雨污分流改造（GW04），透水铺装面积15406m²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.37307893645874,34.793367862441613]},"properties":{"FID":6,"Id":0,"name":"汴京路（公园路-工农路）排水管网及道路海绵化改造（GW06），透水铺装面积20325.77m²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.35137825208555,34.775721779622373]},"properties":{"FID":7,"Id":0,"name":"铁路北沿街（解放路—侯庄桥）道路海绵化改造（DL14），透水铺装面积14699.29m²"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.33259002798351,34.778177383380388]},"properties":{"FID":8,"Id":0,"name":"五福路（五一路—中山路）道路海绵化改（DL15），透水铺装面积12567.22m²"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.39792050935961,34.794681324916823]},"properties":{"FID":9,"Id":0,"name":"汴京路东郊沟雨水泵站新建（GW15），透水铺装面积137.05m²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.3154008016774, 34.790398295106343] },
+      "properties": { "FID": 0, "Id": 0, "name": "2022年示范区老旧小区改造\n透水铺装面积33970.63m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.32510900258119, 34.786020086855615] },
+      "properties": { "FID": 1, "Id": 0, "name": "环城公园一期城墙西南角绿化\n透水铺装面积2881.53m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.22945467014681, 34.795918644639869] },
+      "properties": { "FID": 2, "Id": 0, "name": "综合保税产业园区基础设施建设\n透水铺装面积55200m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.33710148605057, 34.813069799569888] },
+      "properties": { "FID": 3, "Id": 0, "name": "龙亭北路道路海绵化改造\n透水铺装面积15945m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.33264713504767, 34.813355334890595] },
+      "properties": { "FID": 4, "Id": 0, "name": "人行道提升改造\n透水铺装面积41715.70m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.35280592868905, 34.781432486036373] },
+      "properties": { "FID": 5, "Id": 0, "name": "南部片区雨污分流改造\n透水铺装面积15406m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.37307893645874, 34.793367862441613] },
+      "properties": { "FID": 6, "Id": 0, "name": "汴京路管网及道路海绵化改造\n透水铺装面积20325.77m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.35137825208555, 34.775721779622373] },
+      "properties": { "FID": 7, "Id": 0, "name": "铁路北沿街道路海绵化改造\n透水铺装面积14699.29m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 8,
+      "geometry": { "type": "Point", "coordinates": [114.33259002798351, 34.778177383380388] },
+      "properties": { "FID": 8, "Id": 0, "name": "五福路道路海绵化改\n透水铺装面积12567.22m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 9,
+      "geometry": { "type": "Point", "coordinates": [114.39792050935961, 34.794681324916823] },
+      "properties": { "FID": 9, "Id": 0, "name": "汴京路东郊沟雨水泵站新建\n透水铺装面积137.05m²" }
+    }
+  ]
+}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index a247296..0955a68 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -117,19 +117,22 @@
       fileIndex = index;
     }
   });
+  uploadList.value.splice(fileIndex, 1);
+  props.saveFileArr.splice(fileIndex, 1);
+
   // id为空时做逻辑删除，不调用删除接口
-  let id = uploadList.value[fileIndex].id;
-  if (!!!id) {
-    uploadList.value.splice(fileIndex, 1);
-    props.saveFileArr.splice(fileIndex, 1);
-  } else {
-    let ids = [];
-    ids.push(id);
-    sysUploadDel(ids).then(res => {
-      uploadList.value.splice(fileIndex, 1);
-      props.saveFileArr.splice(fileIndex, 1);
-    });
-  }
+  // let id = uploadList.value[fileIndex].id;
+  // if (!!!id) {
+  //   uploadList.value.splice(fileIndex, 1);
+  //   props.saveFileArr.splice(fileIndex, 1);
+  // } else {
+  //   let ids = [];
+  //   ids.push(id);
+  //   sysUploadDel(ids).then(res => {
+  //     uploadList.value.splice(fileIndex, 1);
+  //     props.saveFileArr.splice(fileIndex, 1);
+  //   });
+  // }
 };
 // 文件方法预览
 const handlePictureCardPreview = file => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 1707a00..e81aac9 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -178,7 +178,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(3);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
index 014c2dc..97c9878 100644
--- a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
@@ -48,11 +48,6 @@
 import bus from '@/bus';
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 import kaifengFangHong from '@/assets/geojson/kaifeng/kaifengFangHong.json'; //防洪标准
-import kaifengRainUse from '@/assets/geojson/kaifeng/kaifengRainUse.json'; //雨水利用
-import kaifengTouShuiArea from '@/assets/geojson/kaifeng/kaifengTouShuiArea.json'; //透水面积
-import kaifengNatureWater from '@/assets/geojson/kaifeng/kaifengNatureWater.json'; //天然水域
-import kaifengShengHuoWS from '@/assets/geojson/kaifeng/kaifengShengHuoWS.json'; //生活污水
-import kaifengBOD from '@/assets/geojson/kaifeng/kaifengBOD.json'; //进水BOD
 import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
 import tuLi72X from '@/assets/newImgs/tuLi72X.png';
 
@@ -63,81 +58,50 @@
   { id: 'nlxc', name: '内涝消除' },
 ]);
 
-const curTab = ref('fhbz');
+const curTab = ref('');
 const quotaInfo = ref({ isCompliance: 1 }); //改造措施数据
 const tableData = ref([]);
 
 const tabClick = item => {
-  bus.emit('closeAllLayer');
   curTab.value = item.id;
-  if (curTab.value == 'fhbz') {
-    bus.emit('jhkhclick', 'fhbz');
-    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengFangHong', kaifengFangHong, tuLi72X, 20, 1); //图层名、图层geojson，图标，标注每行多少个字，行间距
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  } else if (curTab.value == 'nlbz') {
-    bus.emit('jhkhclick', 'nlbz');
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: false,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  } else {
-    bus.emit('jhkhclick', 'nlxc');
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: false,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  }
   getjb();
   getkhzn();
+  bus.emit('removeKHLayer'); //清除图层
+  if (curTab.value == 'fhbz') {
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengFangHong', kaifengFangHong, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.315, 34.802],
+        zoom: 11.2,
+      });
+    }, 1000);
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: true },
+      { layername: 'cesiumPaishuiArea2', show: true },
+    ]);
+  } else if (curTab.value == 'nlbz') {
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: true },
+      { layername: 'cesiumPaishuiArea2', show: false },
+    ]);
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.315, 34.802],
+        zoom: 11.2,
+      });
+    }, 200);
+  } else {
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: false },
+      { layername: 'cesiumPaishuiArea2', show: true },
+    ]);
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.295, 34.822],
+        zoom: 11.8,
+      });
+    }, 200);
+  }
 };
 
 // 产出绩效公共指标信息
@@ -158,21 +122,13 @@
   });
   if (res && res.code == 200) {
     tableData.value = res.data;
-    console.log('-----', tableData.value);
   }
 }
-//删除图层
-const removeSelectedLayer = layerList => {
-  layerList.forEach(element => {
-    if (newfiberMapbox.map.hasImage(element)) {
-      newfiberMapbox.map.removeImage(element);
-      newfiberMapBoxVectorLayer.removeByIds([element]);
-    }
-  });
-};
+
 onMounted(() => {
-  getjb();
-  getkhzn();
+  setTimeout(() => {
+    tabClick(tabList.value[0]);
+  });
 });
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
index e8cd155..1e3dffd 100644
--- a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
+++ b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
@@ -51,15 +51,65 @@
         </div>
       </div>
     </div>
+
+    <!-- 地图水体点击弹窗 -->
+    <el-dialog v-model="dialogShow" :title="ExamineYearA + blackWaterNameA + '水质监测详情'" append-to-body width="900px">
+      <div class="hcstDialog">
+        <div class="part">
+          <div class="title">透明度(cm)</div>
+          <ChartBar3D :echartData="echartData1" class="chart" :key="refresh1"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">氨氮(mg/L)</div>
+          <ChartBar3D :key="refresh2" :echartData="echartData2" class="chart"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">溶解氧(mg/L)</div>
+          <ChartBar3D :key="refresh3" :echartData="echartData3" class="chart"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">氧化还原电位(mV)</div>
+          <ChartBar3D :echartData="echartData4" class="chart" :key="refresh4"></ChartBar3D>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script setup>
 import bus from '@/bus';
+import { blackWaterInfoList, queryYearStatistic } from '@/api/spongePerformance/prevention';
+import ChartBar3D from '@/views/sponeScreen/Echarts/echartBar3D.vue';
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
-import { blackWaterInfoList } from '@/api/spongePerformance/prevention';
+import kaifengShengHuoWS from '@/assets/geojson/kaifeng/kaifengShengHuoWS.json'; //生活污水
+import kaifengBOD from '@/assets/geojson/kaifeng/kaifengBOD.json'; //进水BOD
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
+import tuLi72X from '@/assets/newImgs/tuLi72X.png';
 
 const { proxy } = getCurrentInstance();
-const hcdatas = ref('');
+const dialogShow = ref(false);
+const ExamineYearA = ref('');
+const blackWaterCodeA = ref('');
+const blackWaterNameA = ref('');
+const refresh1 = ref(1);
+const refresh2 = ref(1);
+const refresh3 = ref(1);
+const refresh4 = ref(1);
+const echartData1 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [126, 162, 119, 86, 113],
+});
+const echartData2 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [0.8, 0.35, 1.12, 0.9, 0.98],
+});
+const echartData3 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [5.4, 13, 9.2, 10.4, 8.9],
+});
+const echartData4 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [126, 162, 119, 86, 113],
+});
 const tabs = ref([
   { id: 1, name: '黑臭水体' },
   { id: 2, name: '生活污水' },
@@ -73,82 +123,36 @@
 
 const tabClick = item => {
   curTab.value = item.id;
+  bus.emit('removeKHLayer'); //清除图层
   if (curTab.value == 1) {
-    bus.emit('jhkhclick', 'hcst');
     type.value = 'hcst';
-    addOdorousWaterBodies();
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    addOdorousWaterBodies(); //黑臭水体图层
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.803],
+        zoom: 11.9,
+      });
+    }, 500);
   } else if (curTab.value == 2) {
     type.value = 'shwssjl';
-    bus.emit('jhkhclick', 'shwssjl');
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    // 生活污水收集率
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengShengHuoWS', kaifengShengHuoWS, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.763],
+        zoom: 11.6,
+      });
+    }, 500);
   } else {
     type.value = 'cqjsbod';
-    bus.emit('jhkhclick', 'cqjsbod');
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    // 进水BOD
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengBOD', kaifengBOD, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.763],
+        zoom: 11.6,
+      });
+    }, 500);
   }
   getjb();
   getkhzn();
@@ -175,18 +179,11 @@
   }
 }
 
-// 黑臭基础信息 地图点击可查看监测详情
-async function getHc() {
-  let res = await blackWaterInfoList();
-  if (res && res.code == 200) {
-    hcdatas.value = res.data;
-  }
-}
 //地图渲染黑臭水体
 const addOdorousWaterBodies = async () => {
   // 飞哥 这=这里
   let params = {
-    examineYear: 2024,
+    examineYear: 2023,
   };
   let res = await blackWaterInfoList(params);
   console.log(res, 'ress');
@@ -242,13 +239,70 @@
     //newfiberMapbox.map.moveLayer('waterLine', 'odorousWaterBodies');
   }
 };
+
+// 点击黑臭水体查看监测指标详情
+const queryYearStatist = async () => {
+  let params = {
+    blackWaterCode: blackWaterCodeA.value,
+    sampleDate: ExamineYearA.value,
+  };
+  const res = await queryYearStatistic(params);
+  refresh1.value++;
+  refresh2.value++;
+  refresh3.value++;
+  refresh4.value++;
+  echartData1.value.xAxis = res.data.datelist;
+  echartData1.value.seriesData = res.data.tralist;
+  echartData2.value.xAxis = res.data.datelist;
+  echartData2.value.seriesData = res.data.nh3nlist;
+  echartData3.value.xAxis = res.data.datelist;
+  echartData3.value.seriesData = res.data.dolist;
+  echartData4.value.xAxis = res.data.datelist;
+  echartData4.value.seriesData = res.data.orplist;
+  // console.log(echartData1.value, '123');
+};
+
 onMounted(() => {
-  // getHc();
   getjb();
   getkhzn();
+  setTimeout(() => {
+    // 地图黑臭水体点击查看监测数据详情
+    newfiberMapbox.map.on('click', 'waterLine', e => {
+      let clickfeature = newfiberMapbox.map
+        .queryRenderedFeatures([
+          [e.point.x - 10 / 2, e.point.y - 10 / 2],
+          [e.point.x + 10 / 2, e.point.y + 10 / 2],
+        ])
+        // .filter(i => i.layer.id == 'odorousWaterBodies' || i.layer.id == 'waterLine');
+        .filter(i => i.layer.id == 'waterLine');
+      dialogShow.value = true;
+      blackWaterCodeA.value = clickfeature[0].properties.blackWaterCode;
+      blackWaterNameA.value = clickfeature[0].properties.blackWaterName;
+
+      queryYearStatist();
+      console.log('clickfeature', '点击事件11', clickfeature);
+      // emits('clicksWaterBodies', clickfeature[0].properties);
+    });
+  }, 5000);
 });
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
+.hcstDialog {
+  display: flex;
+  flex-wrap: wrap;
+  .part {
+    width: 48%;
+    margin-right: 2%;
+    .title {
+      font-size: 18px;
+      font-weight: bold;
+      color: #fff;
+    }
+    .chart {
+      height: 300px !important;
+    }
+  }
+}
 .chanChuJiXiao {
   width: 460px;
 
diff --git a/src/views/sponeScreen/evaluationKH/index.vue b/src/views/sponeScreen/evaluationKH/index.vue
index f5a6e6f..bf63034 100644
--- a/src/views/sponeScreen/evaluationKH/index.vue
+++ b/src/views/sponeScreen/evaluationKH/index.vue
@@ -33,7 +33,7 @@
 import xiangMuJianShe from './xiangMuJianShe'; //项目建设完成情况
 import ziJinJiXiao from './ziJinJiXiao'; //资金绩效评价
 import bus from '@/bus';
-import { onBeforeUnmount } from 'vue';
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
@@ -52,37 +52,38 @@
   { immediate: true }
 );
 
-onMounted(() => {});
-onBeforeUnmount(() => {
-  if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-    newfiberMapbox.map.removeImage('kaifengFangHong');
-    newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-  }
+//删除图层
+const removeSelectedLayer = () => {
+  let layerList = ['kaifengFangHong', 'kaifengRainUse', 'kaifengTouShuiArea', 'kaifengNatureWater', 'kaifengShengHuoWS', 'kaifengBOD'];
+  layerList.forEach(element => {
+    if (newfiberMapbox.map.hasImage(element)) {
+      newfiberMapbox.map.removeImage(element);
+      newfiberMapBoxVectorLayer.removeByIds([element]);
+    }
+  });
   if (newfiberMapbox.map.getLayer('waterLine')) {
     newfiberMapbox.map.removeLayer('waterLine');
     newfiberMapbox.map.removeLayer('waterLabel');
     newfiberMapbox.map.removeSource('waterLine');
     newfiberMapbox.map.removeSource('waterLabel');
   }
-  bus.emit('setIniteLayer', [
-    {
-      layername: 'sewageFactory',
-      show: true,
-    },
-    {
-      layername: 'waterLoging',
-      show: true,
-    },
-    {
-      layername: 'cesiumPaishuiArea2',
-      show: true,
-    },
-  ]);
-  newfiberMapbox.map.easeTo({
-    center: [114.315, 34.852],
-    zoom: 10.4,
+};
+
+onMounted(() => {
+  // 清除图层
+  bus.on('removeKHLayer', () => {
+    removeSelectedLayer();
   });
 });
+onBeforeUnmount(() => {
+  removeSelectedLayer(['kaifengFangHong', 'kaifengRainUse']);
+  bus.emit('setIniteLayer', [
+    { layername: 'sewageFactory', show: true },
+    { layername: 'waterLoging', show: true },
+    { layername: 'cesiumPaishuiArea2', show: true },
+  ]);
+  bus.off('removeKHLayer');
+});
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/geojson/kaifeng/kaifengNatureWater.json b/src/assets/geojson/kaifeng/kaifengNatureWater.json
index 2ff002f..96b8e61 100644
--- a/src/assets/geojson/kaifeng/kaifengNatureWater.json
+++ b/src/assets/geojson/kaifeng/kaifengNatureWater.json
@@ -1 +1,53 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33464588229256,34.79216861409467]},"properties":{"FID":0,"Id":0,"name":"包公湖（TSBGH），水面面积0.39km²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.34498226090189,34.807130664899333]},"properties":{"FID":1,"Id":0,"name":"龙亭湖（TSLTH），水面面积0.47km²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33693016485816,34.81489722562236]},"properties":{"FID":2,"Id":0,"name":"西北湖（TSXBH），水面面积0.19km²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36736823004473,34.815525403327904]},"properties":{"FID":3,"Id":0,"name":"铁塔湖（TSTTH），水面面积0.08km²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.36234280840043,34.805760095359972]},"properties":{"FID":4,"Id":0,"name":"阳光湖（TSYGH），水面面积0.11km²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.29255797602144,34.800449138394953]},"properties":{"FID":5,"Id":0,"name":"金明池（TSJMC），水面面积0.14km²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.24298904434796,34.807644628476581]},"properties":{"FID":6,"Id":0,"name":"中意湖（TSZYH），水面面积0.15km²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.27488333967011,34.890045363108491]},"properties":{"FID":7,"Id":0,"name":"黑岗口水库（TSHGKSK），水面面积2.78km²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.33464588229256, 34.79216861409467] },
+      "properties": { "FID": 0, "Id": 0, "name": "包公湖\n水面面积0.39km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.34498226090189, 34.807130664899333] },
+      "properties": { "FID": 1, "Id": 0, "name": "龙亭湖\n水面面积0.47km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.33693016485816, 34.81489722562236] },
+      "properties": { "FID": 2, "Id": 0, "name": "西北湖\n水面面积0.19km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.36736823004473, 34.815525403327904] },
+      "properties": { "FID": 3, "Id": 0, "name": "铁塔湖\n水面面积0.08km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.36234280840043, 34.805760095359972] },
+      "properties": { "FID": 4, "Id": 0, "name": "阳光湖\n水面面积0.11km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.29255797602144, 34.800449138394953] },
+      "properties": { "FID": 5, "Id": 0, "name": "金明池\n水面面积0.14km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.24298904434796, 34.807644628476581] },
+      "properties": { "FID": 6, "Id": 0, "name": "中意湖\n水面面积0.15km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.27488333967011, 34.890045363108491] },
+      "properties": { "FID": 7, "Id": 0, "name": "黑岗口水库\n水面面积2.78km²" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengRainUse.json b/src/assets/geojson/kaifeng/kaifengRainUse.json
index 58596f7..3b691da 100644
--- a/src/assets/geojson/kaifeng/kaifengRainUse.json
+++ b/src/assets/geojson/kaifeng/kaifengRainUse.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.34471576126923,34.807244879027621]},"properties":{"FID":0,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.33672077228964,34.815144689566978]},"properties":{"FID":1,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.29246279758119,34.80039203133083]},"properties":{"FID":2,"Id":0,"name":"金明池，汇水面积0.17km²，收集雨水2.7万吨/年"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.24277965177946,34.807530414348321]},"properties":{"FID":3,"Id":0,"name":"中意湖，汇水面积0.22km²，收集雨水3.5万吨/年"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.34471576126923, 34.807244879027621] },
+      "properties": { "FID": 0, "Id": 0, "name": "龙亭湖，汇水面积0.28km²\n收集雨水4.5万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.33672077228964, 34.815144689566978] },
+      "properties": { "FID": 1, "Id": 0, "name": "西北湖，汇水面积0.14km²\n收集雨水2.2万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.29246279758119, 34.80039203133083] },
+      "properties": { "FID": 2, "Id": 0, "name": "金明池，汇水面积0.17km²\n收集雨水2.7万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.24277965177946, 34.807530414348321] },
+      "properties": { "FID": 3, "Id": 0, "name": "中意湖，汇水面积0.22km²\n收集雨水3.5万吨/年" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
index 5587963..7b6a3ca 100644
--- a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
+++ b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，实际处理7.54万m³/日"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，实际处理9.7万m³/日"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，实际处理20.7万m³/日"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n实际处理7.54万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n实际处理9.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n实际处理20.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": { "FID": 3, "Id": 0, "name": "祥符区污水处理厂\n设计规模4万m³/日\n实际处理2.63万m³/日" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
index 2027bf0..ae6535d 100644
--- a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
+++ b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
@@ -1 +1,65 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3154008016774,34.790398295106343]},"properties":{"FID":0,"Id":0,"name":"2022年示范区老旧小区改造（JZ01），透水铺装面积33970.63m²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32510900258119,34.786020086855615]},"properties":{"FID":1,"Id":0,"name":"环城公园一期城墙西南角绿化（GY01），透水铺装面积2881.53m²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.22945467014681,34.795918644639869]},"properties":{"FID":2,"Id":0,"name":"综合保税产业园区基础设施建设（GY02），透水铺装面积55200m²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.33710148605057,34.813069799569888]},"properties":{"FID":3,"Id":0,"name":"龙亭北路（金耀路—广济河）道路海绵化改造（DL13），透水铺装面积15945m²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.33264713504767,34.813355334890595]},"properties":{"FID":4,"Id":0,"name":"人行道提升改造（DL12），透水铺装面积41715.70m²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.35280592868905,34.781432486036373]},"properties":{"FID":5,"Id":0,"name":"南部片区雨污分流改造（GW04），透水铺装面积15406m²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.37307893645874,34.793367862441613]},"properties":{"FID":6,"Id":0,"name":"汴京路（公园路-工农路）排水管网及道路海绵化改造（GW06），透水铺装面积20325.77m²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.35137825208555,34.775721779622373]},"properties":{"FID":7,"Id":0,"name":"铁路北沿街（解放路—侯庄桥）道路海绵化改造（DL14），透水铺装面积14699.29m²"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.33259002798351,34.778177383380388]},"properties":{"FID":8,"Id":0,"name":"五福路（五一路—中山路）道路海绵化改（DL15），透水铺装面积12567.22m²"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.39792050935961,34.794681324916823]},"properties":{"FID":9,"Id":0,"name":"汴京路东郊沟雨水泵站新建（GW15），透水铺装面积137.05m²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.3154008016774, 34.790398295106343] },
+      "properties": { "FID": 0, "Id": 0, "name": "2022年示范区老旧小区改造\n透水铺装面积33970.63m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.32510900258119, 34.786020086855615] },
+      "properties": { "FID": 1, "Id": 0, "name": "环城公园一期城墙西南角绿化\n透水铺装面积2881.53m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.22945467014681, 34.795918644639869] },
+      "properties": { "FID": 2, "Id": 0, "name": "综合保税产业园区基础设施建设\n透水铺装面积55200m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.33710148605057, 34.813069799569888] },
+      "properties": { "FID": 3, "Id": 0, "name": "龙亭北路道路海绵化改造\n透水铺装面积15945m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.33264713504767, 34.813355334890595] },
+      "properties": { "FID": 4, "Id": 0, "name": "人行道提升改造\n透水铺装面积41715.70m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.35280592868905, 34.781432486036373] },
+      "properties": { "FID": 5, "Id": 0, "name": "南部片区雨污分流改造\n透水铺装面积15406m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.37307893645874, 34.793367862441613] },
+      "properties": { "FID": 6, "Id": 0, "name": "汴京路管网及道路海绵化改造\n透水铺装面积20325.77m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.35137825208555, 34.775721779622373] },
+      "properties": { "FID": 7, "Id": 0, "name": "铁路北沿街道路海绵化改造\n透水铺装面积14699.29m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 8,
+      "geometry": { "type": "Point", "coordinates": [114.33259002798351, 34.778177383380388] },
+      "properties": { "FID": 8, "Id": 0, "name": "五福路道路海绵化改\n透水铺装面积12567.22m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 9,
+      "geometry": { "type": "Point", "coordinates": [114.39792050935961, 34.794681324916823] },
+      "properties": { "FID": 9, "Id": 0, "name": "汴京路东郊沟雨水泵站新建\n透水铺装面积137.05m²" }
+    }
+  ]
+}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index a247296..0955a68 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -117,19 +117,22 @@
       fileIndex = index;
     }
   });
+  uploadList.value.splice(fileIndex, 1);
+  props.saveFileArr.splice(fileIndex, 1);
+
   // id为空时做逻辑删除，不调用删除接口
-  let id = uploadList.value[fileIndex].id;
-  if (!!!id) {
-    uploadList.value.splice(fileIndex, 1);
-    props.saveFileArr.splice(fileIndex, 1);
-  } else {
-    let ids = [];
-    ids.push(id);
-    sysUploadDel(ids).then(res => {
-      uploadList.value.splice(fileIndex, 1);
-      props.saveFileArr.splice(fileIndex, 1);
-    });
-  }
+  // let id = uploadList.value[fileIndex].id;
+  // if (!!!id) {
+  //   uploadList.value.splice(fileIndex, 1);
+  //   props.saveFileArr.splice(fileIndex, 1);
+  // } else {
+  //   let ids = [];
+  //   ids.push(id);
+  //   sysUploadDel(ids).then(res => {
+  //     uploadList.value.splice(fileIndex, 1);
+  //     props.saveFileArr.splice(fileIndex, 1);
+  //   });
+  // }
 };
 // 文件方法预览
 const handlePictureCardPreview = file => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 1707a00..e81aac9 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -178,7 +178,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(3);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
index 014c2dc..97c9878 100644
--- a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
@@ -48,11 +48,6 @@
 import bus from '@/bus';
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 import kaifengFangHong from '@/assets/geojson/kaifeng/kaifengFangHong.json'; //防洪标准
-import kaifengRainUse from '@/assets/geojson/kaifeng/kaifengRainUse.json'; //雨水利用
-import kaifengTouShuiArea from '@/assets/geojson/kaifeng/kaifengTouShuiArea.json'; //透水面积
-import kaifengNatureWater from '@/assets/geojson/kaifeng/kaifengNatureWater.json'; //天然水域
-import kaifengShengHuoWS from '@/assets/geojson/kaifeng/kaifengShengHuoWS.json'; //生活污水
-import kaifengBOD from '@/assets/geojson/kaifeng/kaifengBOD.json'; //进水BOD
 import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
 import tuLi72X from '@/assets/newImgs/tuLi72X.png';
 
@@ -63,81 +58,50 @@
   { id: 'nlxc', name: '内涝消除' },
 ]);
 
-const curTab = ref('fhbz');
+const curTab = ref('');
 const quotaInfo = ref({ isCompliance: 1 }); //改造措施数据
 const tableData = ref([]);
 
 const tabClick = item => {
-  bus.emit('closeAllLayer');
   curTab.value = item.id;
-  if (curTab.value == 'fhbz') {
-    bus.emit('jhkhclick', 'fhbz');
-    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengFangHong', kaifengFangHong, tuLi72X, 20, 1); //图层名、图层geojson，图标，标注每行多少个字，行间距
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  } else if (curTab.value == 'nlbz') {
-    bus.emit('jhkhclick', 'nlbz');
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: false,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  } else {
-    bus.emit('jhkhclick', 'nlxc');
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: false,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  }
   getjb();
   getkhzn();
+  bus.emit('removeKHLayer'); //清除图层
+  if (curTab.value == 'fhbz') {
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengFangHong', kaifengFangHong, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.315, 34.802],
+        zoom: 11.2,
+      });
+    }, 1000);
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: true },
+      { layername: 'cesiumPaishuiArea2', show: true },
+    ]);
+  } else if (curTab.value == 'nlbz') {
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: true },
+      { layername: 'cesiumPaishuiArea2', show: false },
+    ]);
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.315, 34.802],
+        zoom: 11.2,
+      });
+    }, 200);
+  } else {
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: false },
+      { layername: 'cesiumPaishuiArea2', show: true },
+    ]);
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.295, 34.822],
+        zoom: 11.8,
+      });
+    }, 200);
+  }
 };
 
 // 产出绩效公共指标信息
@@ -158,21 +122,13 @@
   });
   if (res && res.code == 200) {
     tableData.value = res.data;
-    console.log('-----', tableData.value);
   }
 }
-//删除图层
-const removeSelectedLayer = layerList => {
-  layerList.forEach(element => {
-    if (newfiberMapbox.map.hasImage(element)) {
-      newfiberMapbox.map.removeImage(element);
-      newfiberMapBoxVectorLayer.removeByIds([element]);
-    }
-  });
-};
+
 onMounted(() => {
-  getjb();
-  getkhzn();
+  setTimeout(() => {
+    tabClick(tabList.value[0]);
+  });
 });
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
index e8cd155..1e3dffd 100644
--- a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
+++ b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
@@ -51,15 +51,65 @@
         </div>
       </div>
     </div>
+
+    <!-- 地图水体点击弹窗 -->
+    <el-dialog v-model="dialogShow" :title="ExamineYearA + blackWaterNameA + '水质监测详情'" append-to-body width="900px">
+      <div class="hcstDialog">
+        <div class="part">
+          <div class="title">透明度(cm)</div>
+          <ChartBar3D :echartData="echartData1" class="chart" :key="refresh1"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">氨氮(mg/L)</div>
+          <ChartBar3D :key="refresh2" :echartData="echartData2" class="chart"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">溶解氧(mg/L)</div>
+          <ChartBar3D :key="refresh3" :echartData="echartData3" class="chart"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">氧化还原电位(mV)</div>
+          <ChartBar3D :echartData="echartData4" class="chart" :key="refresh4"></ChartBar3D>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script setup>
 import bus from '@/bus';
+import { blackWaterInfoList, queryYearStatistic } from '@/api/spongePerformance/prevention';
+import ChartBar3D from '@/views/sponeScreen/Echarts/echartBar3D.vue';
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
-import { blackWaterInfoList } from '@/api/spongePerformance/prevention';
+import kaifengShengHuoWS from '@/assets/geojson/kaifeng/kaifengShengHuoWS.json'; //生活污水
+import kaifengBOD from '@/assets/geojson/kaifeng/kaifengBOD.json'; //进水BOD
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
+import tuLi72X from '@/assets/newImgs/tuLi72X.png';
 
 const { proxy } = getCurrentInstance();
-const hcdatas = ref('');
+const dialogShow = ref(false);
+const ExamineYearA = ref('');
+const blackWaterCodeA = ref('');
+const blackWaterNameA = ref('');
+const refresh1 = ref(1);
+const refresh2 = ref(1);
+const refresh3 = ref(1);
+const refresh4 = ref(1);
+const echartData1 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [126, 162, 119, 86, 113],
+});
+const echartData2 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [0.8, 0.35, 1.12, 0.9, 0.98],
+});
+const echartData3 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [5.4, 13, 9.2, 10.4, 8.9],
+});
+const echartData4 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [126, 162, 119, 86, 113],
+});
 const tabs = ref([
   { id: 1, name: '黑臭水体' },
   { id: 2, name: '生活污水' },
@@ -73,82 +123,36 @@
 
 const tabClick = item => {
   curTab.value = item.id;
+  bus.emit('removeKHLayer'); //清除图层
   if (curTab.value == 1) {
-    bus.emit('jhkhclick', 'hcst');
     type.value = 'hcst';
-    addOdorousWaterBodies();
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    addOdorousWaterBodies(); //黑臭水体图层
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.803],
+        zoom: 11.9,
+      });
+    }, 500);
   } else if (curTab.value == 2) {
     type.value = 'shwssjl';
-    bus.emit('jhkhclick', 'shwssjl');
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    // 生活污水收集率
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengShengHuoWS', kaifengShengHuoWS, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.763],
+        zoom: 11.6,
+      });
+    }, 500);
   } else {
     type.value = 'cqjsbod';
-    bus.emit('jhkhclick', 'cqjsbod');
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    // 进水BOD
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengBOD', kaifengBOD, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.763],
+        zoom: 11.6,
+      });
+    }, 500);
   }
   getjb();
   getkhzn();
@@ -175,18 +179,11 @@
   }
 }
 
-// 黑臭基础信息 地图点击可查看监测详情
-async function getHc() {
-  let res = await blackWaterInfoList();
-  if (res && res.code == 200) {
-    hcdatas.value = res.data;
-  }
-}
 //地图渲染黑臭水体
 const addOdorousWaterBodies = async () => {
   // 飞哥 这=这里
   let params = {
-    examineYear: 2024,
+    examineYear: 2023,
   };
   let res = await blackWaterInfoList(params);
   console.log(res, 'ress');
@@ -242,13 +239,70 @@
     //newfiberMapbox.map.moveLayer('waterLine', 'odorousWaterBodies');
   }
 };
+
+// 点击黑臭水体查看监测指标详情
+const queryYearStatist = async () => {
+  let params = {
+    blackWaterCode: blackWaterCodeA.value,
+    sampleDate: ExamineYearA.value,
+  };
+  const res = await queryYearStatistic(params);
+  refresh1.value++;
+  refresh2.value++;
+  refresh3.value++;
+  refresh4.value++;
+  echartData1.value.xAxis = res.data.datelist;
+  echartData1.value.seriesData = res.data.tralist;
+  echartData2.value.xAxis = res.data.datelist;
+  echartData2.value.seriesData = res.data.nh3nlist;
+  echartData3.value.xAxis = res.data.datelist;
+  echartData3.value.seriesData = res.data.dolist;
+  echartData4.value.xAxis = res.data.datelist;
+  echartData4.value.seriesData = res.data.orplist;
+  // console.log(echartData1.value, '123');
+};
+
 onMounted(() => {
-  // getHc();
   getjb();
   getkhzn();
+  setTimeout(() => {
+    // 地图黑臭水体点击查看监测数据详情
+    newfiberMapbox.map.on('click', 'waterLine', e => {
+      let clickfeature = newfiberMapbox.map
+        .queryRenderedFeatures([
+          [e.point.x - 10 / 2, e.point.y - 10 / 2],
+          [e.point.x + 10 / 2, e.point.y + 10 / 2],
+        ])
+        // .filter(i => i.layer.id == 'odorousWaterBodies' || i.layer.id == 'waterLine');
+        .filter(i => i.layer.id == 'waterLine');
+      dialogShow.value = true;
+      blackWaterCodeA.value = clickfeature[0].properties.blackWaterCode;
+      blackWaterNameA.value = clickfeature[0].properties.blackWaterName;
+
+      queryYearStatist();
+      console.log('clickfeature', '点击事件11', clickfeature);
+      // emits('clicksWaterBodies', clickfeature[0].properties);
+    });
+  }, 5000);
 });
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
+.hcstDialog {
+  display: flex;
+  flex-wrap: wrap;
+  .part {
+    width: 48%;
+    margin-right: 2%;
+    .title {
+      font-size: 18px;
+      font-weight: bold;
+      color: #fff;
+    }
+    .chart {
+      height: 300px !important;
+    }
+  }
+}
 .chanChuJiXiao {
   width: 460px;
 
diff --git a/src/views/sponeScreen/evaluationKH/index.vue b/src/views/sponeScreen/evaluationKH/index.vue
index f5a6e6f..bf63034 100644
--- a/src/views/sponeScreen/evaluationKH/index.vue
+++ b/src/views/sponeScreen/evaluationKH/index.vue
@@ -33,7 +33,7 @@
 import xiangMuJianShe from './xiangMuJianShe'; //项目建设完成情况
 import ziJinJiXiao from './ziJinJiXiao'; //资金绩效评价
 import bus from '@/bus';
-import { onBeforeUnmount } from 'vue';
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
@@ -52,37 +52,38 @@
   { immediate: true }
 );
 
-onMounted(() => {});
-onBeforeUnmount(() => {
-  if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-    newfiberMapbox.map.removeImage('kaifengFangHong');
-    newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-  }
+//删除图层
+const removeSelectedLayer = () => {
+  let layerList = ['kaifengFangHong', 'kaifengRainUse', 'kaifengTouShuiArea', 'kaifengNatureWater', 'kaifengShengHuoWS', 'kaifengBOD'];
+  layerList.forEach(element => {
+    if (newfiberMapbox.map.hasImage(element)) {
+      newfiberMapbox.map.removeImage(element);
+      newfiberMapBoxVectorLayer.removeByIds([element]);
+    }
+  });
   if (newfiberMapbox.map.getLayer('waterLine')) {
     newfiberMapbox.map.removeLayer('waterLine');
     newfiberMapbox.map.removeLayer('waterLabel');
     newfiberMapbox.map.removeSource('waterLine');
     newfiberMapbox.map.removeSource('waterLabel');
   }
-  bus.emit('setIniteLayer', [
-    {
-      layername: 'sewageFactory',
-      show: true,
-    },
-    {
-      layername: 'waterLoging',
-      show: true,
-    },
-    {
-      layername: 'cesiumPaishuiArea2',
-      show: true,
-    },
-  ]);
-  newfiberMapbox.map.easeTo({
-    center: [114.315, 34.852],
-    zoom: 10.4,
+};
+
+onMounted(() => {
+  // 清除图层
+  bus.on('removeKHLayer', () => {
+    removeSelectedLayer();
   });
 });
+onBeforeUnmount(() => {
+  removeSelectedLayer(['kaifengFangHong', 'kaifengRainUse']);
+  bus.emit('setIniteLayer', [
+    { layername: 'sewageFactory', show: true },
+    { layername: 'waterLoging', show: true },
+    { layername: 'cesiumPaishuiArea2', show: true },
+  ]);
+  bus.off('removeKHLayer');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index 4136405..c89d90d 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -48,6 +48,12 @@
   </div>
 </template>
 <script setup>
+import kaifengTouShuiArea from '@/assets/geojson/kaifeng/kaifengTouShuiArea.json'; //可透水面积
+import kaifengNatureWater from '@/assets/geojson/kaifeng/kaifengNatureWater.json'; //天然水域
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
+import tuLi72X from '@/assets/newImgs/tuLi72X.png';
+import bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
@@ -61,15 +67,30 @@
 
 const tabClick = item => {
   curTab.value = item.id;
-  if (curTab.value == 1) {
-    type.value = 'ktsdmmj';
-    bus.emit('jhkhclick', 'ktsdmmj');
-  } else {
-    bus.emit('jhkhclick', 'trsymj');
-    type.value = 'trsymj';
-  }
   getjb();
   getkhzn();
+  bus.emit('removeKHLayer'); //清除图层
+  if (curTab.value == 1) {
+    type.value = 'ktsdmmj';
+    // 可透水图层渲染
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengTouShuiArea', kaifengTouShuiArea, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.345, 34.803],
+        zoom: 13.0,
+      });
+    }, 500);
+  } else {
+    type.value = 'trsymj';
+    // 天然水域图层渲染
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengNatureWater', kaifengNatureWater, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.345, 34.808],
+        zoom: 13.4,
+      });
+    }, 500);
+  }
 };
 const type = ref('ktsdmmj');
 

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/geojson/kaifeng/kaifengNatureWater.json b/src/assets/geojson/kaifeng/kaifengNatureWater.json
index 2ff002f..96b8e61 100644
--- a/src/assets/geojson/kaifeng/kaifengNatureWater.json
+++ b/src/assets/geojson/kaifeng/kaifengNatureWater.json
@@ -1 +1,53 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33464588229256,34.79216861409467]},"properties":{"FID":0,"Id":0,"name":"包公湖（TSBGH），水面面积0.39km²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.34498226090189,34.807130664899333]},"properties":{"FID":1,"Id":0,"name":"龙亭湖（TSLTH），水面面积0.47km²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33693016485816,34.81489722562236]},"properties":{"FID":2,"Id":0,"name":"西北湖（TSXBH），水面面积0.19km²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36736823004473,34.815525403327904]},"properties":{"FID":3,"Id":0,"name":"铁塔湖（TSTTH），水面面积0.08km²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.36234280840043,34.805760095359972]},"properties":{"FID":4,"Id":0,"name":"阳光湖（TSYGH），水面面积0.11km²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.29255797602144,34.800449138394953]},"properties":{"FID":5,"Id":0,"name":"金明池（TSJMC），水面面积0.14km²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.24298904434796,34.807644628476581]},"properties":{"FID":6,"Id":0,"name":"中意湖（TSZYH），水面面积0.15km²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.27488333967011,34.890045363108491]},"properties":{"FID":7,"Id":0,"name":"黑岗口水库（TSHGKSK），水面面积2.78km²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.33464588229256, 34.79216861409467] },
+      "properties": { "FID": 0, "Id": 0, "name": "包公湖\n水面面积0.39km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.34498226090189, 34.807130664899333] },
+      "properties": { "FID": 1, "Id": 0, "name": "龙亭湖\n水面面积0.47km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.33693016485816, 34.81489722562236] },
+      "properties": { "FID": 2, "Id": 0, "name": "西北湖\n水面面积0.19km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.36736823004473, 34.815525403327904] },
+      "properties": { "FID": 3, "Id": 0, "name": "铁塔湖\n水面面积0.08km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.36234280840043, 34.805760095359972] },
+      "properties": { "FID": 4, "Id": 0, "name": "阳光湖\n水面面积0.11km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.29255797602144, 34.800449138394953] },
+      "properties": { "FID": 5, "Id": 0, "name": "金明池\n水面面积0.14km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.24298904434796, 34.807644628476581] },
+      "properties": { "FID": 6, "Id": 0, "name": "中意湖\n水面面积0.15km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.27488333967011, 34.890045363108491] },
+      "properties": { "FID": 7, "Id": 0, "name": "黑岗口水库\n水面面积2.78km²" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengRainUse.json b/src/assets/geojson/kaifeng/kaifengRainUse.json
index 58596f7..3b691da 100644
--- a/src/assets/geojson/kaifeng/kaifengRainUse.json
+++ b/src/assets/geojson/kaifeng/kaifengRainUse.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.34471576126923,34.807244879027621]},"properties":{"FID":0,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.33672077228964,34.815144689566978]},"properties":{"FID":1,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.29246279758119,34.80039203133083]},"properties":{"FID":2,"Id":0,"name":"金明池，汇水面积0.17km²，收集雨水2.7万吨/年"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.24277965177946,34.807530414348321]},"properties":{"FID":3,"Id":0,"name":"中意湖，汇水面积0.22km²，收集雨水3.5万吨/年"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.34471576126923, 34.807244879027621] },
+      "properties": { "FID": 0, "Id": 0, "name": "龙亭湖，汇水面积0.28km²\n收集雨水4.5万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.33672077228964, 34.815144689566978] },
+      "properties": { "FID": 1, "Id": 0, "name": "西北湖，汇水面积0.14km²\n收集雨水2.2万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.29246279758119, 34.80039203133083] },
+      "properties": { "FID": 2, "Id": 0, "name": "金明池，汇水面积0.17km²\n收集雨水2.7万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.24277965177946, 34.807530414348321] },
+      "properties": { "FID": 3, "Id": 0, "name": "中意湖，汇水面积0.22km²\n收集雨水3.5万吨/年" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
index 5587963..7b6a3ca 100644
--- a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
+++ b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，实际处理7.54万m³/日"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，实际处理9.7万m³/日"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，实际处理20.7万m³/日"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n实际处理7.54万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n实际处理9.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n实际处理20.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": { "FID": 3, "Id": 0, "name": "祥符区污水处理厂\n设计规模4万m³/日\n实际处理2.63万m³/日" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
index 2027bf0..ae6535d 100644
--- a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
+++ b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
@@ -1 +1,65 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3154008016774,34.790398295106343]},"properties":{"FID":0,"Id":0,"name":"2022年示范区老旧小区改造（JZ01），透水铺装面积33970.63m²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32510900258119,34.786020086855615]},"properties":{"FID":1,"Id":0,"name":"环城公园一期城墙西南角绿化（GY01），透水铺装面积2881.53m²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.22945467014681,34.795918644639869]},"properties":{"FID":2,"Id":0,"name":"综合保税产业园区基础设施建设（GY02），透水铺装面积55200m²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.33710148605057,34.813069799569888]},"properties":{"FID":3,"Id":0,"name":"龙亭北路（金耀路—广济河）道路海绵化改造（DL13），透水铺装面积15945m²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.33264713504767,34.813355334890595]},"properties":{"FID":4,"Id":0,"name":"人行道提升改造（DL12），透水铺装面积41715.70m²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.35280592868905,34.781432486036373]},"properties":{"FID":5,"Id":0,"name":"南部片区雨污分流改造（GW04），透水铺装面积15406m²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.37307893645874,34.793367862441613]},"properties":{"FID":6,"Id":0,"name":"汴京路（公园路-工农路）排水管网及道路海绵化改造（GW06），透水铺装面积20325.77m²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.35137825208555,34.775721779622373]},"properties":{"FID":7,"Id":0,"name":"铁路北沿街（解放路—侯庄桥）道路海绵化改造（DL14），透水铺装面积14699.29m²"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.33259002798351,34.778177383380388]},"properties":{"FID":8,"Id":0,"name":"五福路（五一路—中山路）道路海绵化改（DL15），透水铺装面积12567.22m²"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.39792050935961,34.794681324916823]},"properties":{"FID":9,"Id":0,"name":"汴京路东郊沟雨水泵站新建（GW15），透水铺装面积137.05m²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.3154008016774, 34.790398295106343] },
+      "properties": { "FID": 0, "Id": 0, "name": "2022年示范区老旧小区改造\n透水铺装面积33970.63m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.32510900258119, 34.786020086855615] },
+      "properties": { "FID": 1, "Id": 0, "name": "环城公园一期城墙西南角绿化\n透水铺装面积2881.53m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.22945467014681, 34.795918644639869] },
+      "properties": { "FID": 2, "Id": 0, "name": "综合保税产业园区基础设施建设\n透水铺装面积55200m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.33710148605057, 34.813069799569888] },
+      "properties": { "FID": 3, "Id": 0, "name": "龙亭北路道路海绵化改造\n透水铺装面积15945m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.33264713504767, 34.813355334890595] },
+      "properties": { "FID": 4, "Id": 0, "name": "人行道提升改造\n透水铺装面积41715.70m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.35280592868905, 34.781432486036373] },
+      "properties": { "FID": 5, "Id": 0, "name": "南部片区雨污分流改造\n透水铺装面积15406m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.37307893645874, 34.793367862441613] },
+      "properties": { "FID": 6, "Id": 0, "name": "汴京路管网及道路海绵化改造\n透水铺装面积20325.77m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.35137825208555, 34.775721779622373] },
+      "properties": { "FID": 7, "Id": 0, "name": "铁路北沿街道路海绵化改造\n透水铺装面积14699.29m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 8,
+      "geometry": { "type": "Point", "coordinates": [114.33259002798351, 34.778177383380388] },
+      "properties": { "FID": 8, "Id": 0, "name": "五福路道路海绵化改\n透水铺装面积12567.22m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 9,
+      "geometry": { "type": "Point", "coordinates": [114.39792050935961, 34.794681324916823] },
+      "properties": { "FID": 9, "Id": 0, "name": "汴京路东郊沟雨水泵站新建\n透水铺装面积137.05m²" }
+    }
+  ]
+}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index a247296..0955a68 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -117,19 +117,22 @@
       fileIndex = index;
     }
   });
+  uploadList.value.splice(fileIndex, 1);
+  props.saveFileArr.splice(fileIndex, 1);
+
   // id为空时做逻辑删除，不调用删除接口
-  let id = uploadList.value[fileIndex].id;
-  if (!!!id) {
-    uploadList.value.splice(fileIndex, 1);
-    props.saveFileArr.splice(fileIndex, 1);
-  } else {
-    let ids = [];
-    ids.push(id);
-    sysUploadDel(ids).then(res => {
-      uploadList.value.splice(fileIndex, 1);
-      props.saveFileArr.splice(fileIndex, 1);
-    });
-  }
+  // let id = uploadList.value[fileIndex].id;
+  // if (!!!id) {
+  //   uploadList.value.splice(fileIndex, 1);
+  //   props.saveFileArr.splice(fileIndex, 1);
+  // } else {
+  //   let ids = [];
+  //   ids.push(id);
+  //   sysUploadDel(ids).then(res => {
+  //     uploadList.value.splice(fileIndex, 1);
+  //     props.saveFileArr.splice(fileIndex, 1);
+  //   });
+  // }
 };
 // 文件方法预览
 const handlePictureCardPreview = file => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 1707a00..e81aac9 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -178,7 +178,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(3);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
index 014c2dc..97c9878 100644
--- a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
@@ -48,11 +48,6 @@
 import bus from '@/bus';
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 import kaifengFangHong from '@/assets/geojson/kaifeng/kaifengFangHong.json'; //防洪标准
-import kaifengRainUse from '@/assets/geojson/kaifeng/kaifengRainUse.json'; //雨水利用
-import kaifengTouShuiArea from '@/assets/geojson/kaifeng/kaifengTouShuiArea.json'; //透水面积
-import kaifengNatureWater from '@/assets/geojson/kaifeng/kaifengNatureWater.json'; //天然水域
-import kaifengShengHuoWS from '@/assets/geojson/kaifeng/kaifengShengHuoWS.json'; //生活污水
-import kaifengBOD from '@/assets/geojson/kaifeng/kaifengBOD.json'; //进水BOD
 import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
 import tuLi72X from '@/assets/newImgs/tuLi72X.png';
 
@@ -63,81 +58,50 @@
   { id: 'nlxc', name: '内涝消除' },
 ]);
 
-const curTab = ref('fhbz');
+const curTab = ref('');
 const quotaInfo = ref({ isCompliance: 1 }); //改造措施数据
 const tableData = ref([]);
 
 const tabClick = item => {
-  bus.emit('closeAllLayer');
   curTab.value = item.id;
-  if (curTab.value == 'fhbz') {
-    bus.emit('jhkhclick', 'fhbz');
-    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengFangHong', kaifengFangHong, tuLi72X, 20, 1); //图层名、图层geojson，图标，标注每行多少个字，行间距
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  } else if (curTab.value == 'nlbz') {
-    bus.emit('jhkhclick', 'nlbz');
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: false,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  } else {
-    bus.emit('jhkhclick', 'nlxc');
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: false,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  }
   getjb();
   getkhzn();
+  bus.emit('removeKHLayer'); //清除图层
+  if (curTab.value == 'fhbz') {
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengFangHong', kaifengFangHong, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.315, 34.802],
+        zoom: 11.2,
+      });
+    }, 1000);
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: true },
+      { layername: 'cesiumPaishuiArea2', show: true },
+    ]);
+  } else if (curTab.value == 'nlbz') {
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: true },
+      { layername: 'cesiumPaishuiArea2', show: false },
+    ]);
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.315, 34.802],
+        zoom: 11.2,
+      });
+    }, 200);
+  } else {
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: false },
+      { layername: 'cesiumPaishuiArea2', show: true },
+    ]);
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.295, 34.822],
+        zoom: 11.8,
+      });
+    }, 200);
+  }
 };
 
 // 产出绩效公共指标信息
@@ -158,21 +122,13 @@
   });
   if (res && res.code == 200) {
     tableData.value = res.data;
-    console.log('-----', tableData.value);
   }
 }
-//删除图层
-const removeSelectedLayer = layerList => {
-  layerList.forEach(element => {
-    if (newfiberMapbox.map.hasImage(element)) {
-      newfiberMapbox.map.removeImage(element);
-      newfiberMapBoxVectorLayer.removeByIds([element]);
-    }
-  });
-};
+
 onMounted(() => {
-  getjb();
-  getkhzn();
+  setTimeout(() => {
+    tabClick(tabList.value[0]);
+  });
 });
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
index e8cd155..1e3dffd 100644
--- a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
+++ b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
@@ -51,15 +51,65 @@
         </div>
       </div>
     </div>
+
+    <!-- 地图水体点击弹窗 -->
+    <el-dialog v-model="dialogShow" :title="ExamineYearA + blackWaterNameA + '水质监测详情'" append-to-body width="900px">
+      <div class="hcstDialog">
+        <div class="part">
+          <div class="title">透明度(cm)</div>
+          <ChartBar3D :echartData="echartData1" class="chart" :key="refresh1"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">氨氮(mg/L)</div>
+          <ChartBar3D :key="refresh2" :echartData="echartData2" class="chart"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">溶解氧(mg/L)</div>
+          <ChartBar3D :key="refresh3" :echartData="echartData3" class="chart"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">氧化还原电位(mV)</div>
+          <ChartBar3D :echartData="echartData4" class="chart" :key="refresh4"></ChartBar3D>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script setup>
 import bus from '@/bus';
+import { blackWaterInfoList, queryYearStatistic } from '@/api/spongePerformance/prevention';
+import ChartBar3D from '@/views/sponeScreen/Echarts/echartBar3D.vue';
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
-import { blackWaterInfoList } from '@/api/spongePerformance/prevention';
+import kaifengShengHuoWS from '@/assets/geojson/kaifeng/kaifengShengHuoWS.json'; //生活污水
+import kaifengBOD from '@/assets/geojson/kaifeng/kaifengBOD.json'; //进水BOD
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
+import tuLi72X from '@/assets/newImgs/tuLi72X.png';
 
 const { proxy } = getCurrentInstance();
-const hcdatas = ref('');
+const dialogShow = ref(false);
+const ExamineYearA = ref('');
+const blackWaterCodeA = ref('');
+const blackWaterNameA = ref('');
+const refresh1 = ref(1);
+const refresh2 = ref(1);
+const refresh3 = ref(1);
+const refresh4 = ref(1);
+const echartData1 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [126, 162, 119, 86, 113],
+});
+const echartData2 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [0.8, 0.35, 1.12, 0.9, 0.98],
+});
+const echartData3 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [5.4, 13, 9.2, 10.4, 8.9],
+});
+const echartData4 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [126, 162, 119, 86, 113],
+});
 const tabs = ref([
   { id: 1, name: '黑臭水体' },
   { id: 2, name: '生活污水' },
@@ -73,82 +123,36 @@
 
 const tabClick = item => {
   curTab.value = item.id;
+  bus.emit('removeKHLayer'); //清除图层
   if (curTab.value == 1) {
-    bus.emit('jhkhclick', 'hcst');
     type.value = 'hcst';
-    addOdorousWaterBodies();
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    addOdorousWaterBodies(); //黑臭水体图层
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.803],
+        zoom: 11.9,
+      });
+    }, 500);
   } else if (curTab.value == 2) {
     type.value = 'shwssjl';
-    bus.emit('jhkhclick', 'shwssjl');
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    // 生活污水收集率
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengShengHuoWS', kaifengShengHuoWS, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.763],
+        zoom: 11.6,
+      });
+    }, 500);
   } else {
     type.value = 'cqjsbod';
-    bus.emit('jhkhclick', 'cqjsbod');
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    // 进水BOD
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengBOD', kaifengBOD, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.763],
+        zoom: 11.6,
+      });
+    }, 500);
   }
   getjb();
   getkhzn();
@@ -175,18 +179,11 @@
   }
 }
 
-// 黑臭基础信息 地图点击可查看监测详情
-async function getHc() {
-  let res = await blackWaterInfoList();
-  if (res && res.code == 200) {
-    hcdatas.value = res.data;
-  }
-}
 //地图渲染黑臭水体
 const addOdorousWaterBodies = async () => {
   // 飞哥 这=这里
   let params = {
-    examineYear: 2024,
+    examineYear: 2023,
   };
   let res = await blackWaterInfoList(params);
   console.log(res, 'ress');
@@ -242,13 +239,70 @@
     //newfiberMapbox.map.moveLayer('waterLine', 'odorousWaterBodies');
   }
 };
+
+// 点击黑臭水体查看监测指标详情
+const queryYearStatist = async () => {
+  let params = {
+    blackWaterCode: blackWaterCodeA.value,
+    sampleDate: ExamineYearA.value,
+  };
+  const res = await queryYearStatistic(params);
+  refresh1.value++;
+  refresh2.value++;
+  refresh3.value++;
+  refresh4.value++;
+  echartData1.value.xAxis = res.data.datelist;
+  echartData1.value.seriesData = res.data.tralist;
+  echartData2.value.xAxis = res.data.datelist;
+  echartData2.value.seriesData = res.data.nh3nlist;
+  echartData3.value.xAxis = res.data.datelist;
+  echartData3.value.seriesData = res.data.dolist;
+  echartData4.value.xAxis = res.data.datelist;
+  echartData4.value.seriesData = res.data.orplist;
+  // console.log(echartData1.value, '123');
+};
+
 onMounted(() => {
-  // getHc();
   getjb();
   getkhzn();
+  setTimeout(() => {
+    // 地图黑臭水体点击查看监测数据详情
+    newfiberMapbox.map.on('click', 'waterLine', e => {
+      let clickfeature = newfiberMapbox.map
+        .queryRenderedFeatures([
+          [e.point.x - 10 / 2, e.point.y - 10 / 2],
+          [e.point.x + 10 / 2, e.point.y + 10 / 2],
+        ])
+        // .filter(i => i.layer.id == 'odorousWaterBodies' || i.layer.id == 'waterLine');
+        .filter(i => i.layer.id == 'waterLine');
+      dialogShow.value = true;
+      blackWaterCodeA.value = clickfeature[0].properties.blackWaterCode;
+      blackWaterNameA.value = clickfeature[0].properties.blackWaterName;
+
+      queryYearStatist();
+      console.log('clickfeature', '点击事件11', clickfeature);
+      // emits('clicksWaterBodies', clickfeature[0].properties);
+    });
+  }, 5000);
 });
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
+.hcstDialog {
+  display: flex;
+  flex-wrap: wrap;
+  .part {
+    width: 48%;
+    margin-right: 2%;
+    .title {
+      font-size: 18px;
+      font-weight: bold;
+      color: #fff;
+    }
+    .chart {
+      height: 300px !important;
+    }
+  }
+}
 .chanChuJiXiao {
   width: 460px;
 
diff --git a/src/views/sponeScreen/evaluationKH/index.vue b/src/views/sponeScreen/evaluationKH/index.vue
index f5a6e6f..bf63034 100644
--- a/src/views/sponeScreen/evaluationKH/index.vue
+++ b/src/views/sponeScreen/evaluationKH/index.vue
@@ -33,7 +33,7 @@
 import xiangMuJianShe from './xiangMuJianShe'; //项目建设完成情况
 import ziJinJiXiao from './ziJinJiXiao'; //资金绩效评价
 import bus from '@/bus';
-import { onBeforeUnmount } from 'vue';
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
@@ -52,37 +52,38 @@
   { immediate: true }
 );
 
-onMounted(() => {});
-onBeforeUnmount(() => {
-  if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-    newfiberMapbox.map.removeImage('kaifengFangHong');
-    newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-  }
+//删除图层
+const removeSelectedLayer = () => {
+  let layerList = ['kaifengFangHong', 'kaifengRainUse', 'kaifengTouShuiArea', 'kaifengNatureWater', 'kaifengShengHuoWS', 'kaifengBOD'];
+  layerList.forEach(element => {
+    if (newfiberMapbox.map.hasImage(element)) {
+      newfiberMapbox.map.removeImage(element);
+      newfiberMapBoxVectorLayer.removeByIds([element]);
+    }
+  });
   if (newfiberMapbox.map.getLayer('waterLine')) {
     newfiberMapbox.map.removeLayer('waterLine');
     newfiberMapbox.map.removeLayer('waterLabel');
     newfiberMapbox.map.removeSource('waterLine');
     newfiberMapbox.map.removeSource('waterLabel');
   }
-  bus.emit('setIniteLayer', [
-    {
-      layername: 'sewageFactory',
-      show: true,
-    },
-    {
-      layername: 'waterLoging',
-      show: true,
-    },
-    {
-      layername: 'cesiumPaishuiArea2',
-      show: true,
-    },
-  ]);
-  newfiberMapbox.map.easeTo({
-    center: [114.315, 34.852],
-    zoom: 10.4,
+};
+
+onMounted(() => {
+  // 清除图层
+  bus.on('removeKHLayer', () => {
+    removeSelectedLayer();
   });
 });
+onBeforeUnmount(() => {
+  removeSelectedLayer(['kaifengFangHong', 'kaifengRainUse']);
+  bus.emit('setIniteLayer', [
+    { layername: 'sewageFactory', show: true },
+    { layername: 'waterLoging', show: true },
+    { layername: 'cesiumPaishuiArea2', show: true },
+  ]);
+  bus.off('removeKHLayer');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index 4136405..c89d90d 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -48,6 +48,12 @@
   </div>
 </template>
 <script setup>
+import kaifengTouShuiArea from '@/assets/geojson/kaifeng/kaifengTouShuiArea.json'; //可透水面积
+import kaifengNatureWater from '@/assets/geojson/kaifeng/kaifengNatureWater.json'; //天然水域
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
+import tuLi72X from '@/assets/newImgs/tuLi72X.png';
+import bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
@@ -61,15 +67,30 @@
 
 const tabClick = item => {
   curTab.value = item.id;
-  if (curTab.value == 1) {
-    type.value = 'ktsdmmj';
-    bus.emit('jhkhclick', 'ktsdmmj');
-  } else {
-    bus.emit('jhkhclick', 'trsymj');
-    type.value = 'trsymj';
-  }
   getjb();
   getkhzn();
+  bus.emit('removeKHLayer'); //清除图层
+  if (curTab.value == 1) {
+    type.value = 'ktsdmmj';
+    // 可透水图层渲染
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengTouShuiArea', kaifengTouShuiArea, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.345, 34.803],
+        zoom: 13.0,
+      });
+    }, 500);
+  } else {
+    type.value = 'trsymj';
+    // 天然水域图层渲染
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengNatureWater', kaifengNatureWater, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.345, 34.808],
+        zoom: 13.4,
+      });
+    }, 500);
+  }
 };
 const type = ref('ktsdmmj');
 
diff --git a/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue b/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
index cc9467a..4e9557c 100644
--- a/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
+++ b/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
@@ -9,13 +9,13 @@
             <el-progress
               :text-inside="true"
               :stroke-width="20"
-              :percentage="Math.round((jhtrhmzj.reformAchievement / jhtrhmzj.quotaTarget) * 100)"
+              :percentage="Math.round((jhkgxm.reformAchievement / jhkgxm.quotaTarget) * 100)"
               status="success"
             ></el-progress>
-            <p class="title2">{{ jhtrhmzj.quotaTarget }}</p>
+            <p class="title2">{{ jhkgxm.quotaTarget }}</p>
             <div class="progressunit">
               <div class="title">（单位：个）</div>
-              <div class="title2">{{ jhtrhmzj.remark }}</div>
+              <div class="title2">{{ jhkgxm.remark }}</div>
             </div>
           </div>
         </div>
@@ -137,7 +137,7 @@
 </script>
 <style lang="scss" scoped>
 .xiangMuJianShe {
-  margin: 10px 0px;
+  margin: 5px 0px;
   width: 460px;
 
   .ListBoxBody {
@@ -149,7 +149,9 @@
     .planCont {
       margin: 5px auto;
       font-size: 13px;
-
+      .list {
+        margin-top: -12px;
+      }
       .activePlan {
         background: #3ce6ff;
       }
@@ -159,7 +161,7 @@
         margin-bottom: 5px;
         align-items: center;
         width: 100%;
-        margin-top: -5px;
+        margin-top: -10px;
         font-size: 14px;
 
         .title {
@@ -209,6 +211,7 @@
       border-radius: 3px;
       height: 40px;
       padding: 0 10px;
+      font-size: 18px;
 
       .titles {
         width: 50px;
@@ -227,7 +230,7 @@
 
       .vals {
         color: #ff5e66;
-        font-size: 14px;
+        margin-left: 20px;
       }
       .colors1 {
         color: #00fe00;

diff --git a/src/assets/geojson/kaifeng/kaifengBOD.json b/src/assets/geojson/kaifeng/kaifengBOD.json
index 394c581..f5196b7 100644
--- a/src/assets/geojson/kaifeng/kaifengBOD.json
+++ b/src/assets/geojson/kaifeng/kaifengBOD.json
@@ -1 +1,33 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，进水BOD：168mg/L"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，进水BOD：198mg/L"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，进水BOD：75mg/L"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n进水BOD: 168mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n进水BOD: 198mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n进水BOD: 75mg/L" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": {
+        "FID": 3,
+        "Id": 0,
+        "name": "祥符区污水处理厂\n设计规模4万m³/日\n进水BOD: 157mg/L"
+      }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengFangHong.json b/src/assets/geojson/kaifeng/kaifengFangHong.json
index 85926b9..68eaf56 100644
--- a/src/assets/geojson/kaifeng/kaifengFangHong.json
+++ b/src/assets/geojson/kaifeng/kaifengFangHong.json
@@ -6,15 +6,12 @@
       "id": 0,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.28002780574856,
-          34.913965632502531
-        ]
+        "coordinates": [114.28002780574856, 34.913965632502531]
       },
       "properties": {
         "FID": 0,
         "Id": 0,
-        "name": "黄河：防洪能力100年一遇，在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
+        "name": "黄河：防洪能力100年一遇\n在原有黄河大堤的基础上建立标准化堤防，经过治理已能保证22000立方米每秒（花园口站）流量不决口）"
       }
     },
     {
@@ -22,15 +19,12 @@
       "id": 1,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.32491987132551,
-          34.786429326389282
-        ]
+        "coordinates": [114.32491987132551, 34.786429326389282]
       },
       "properties": {
         "FID": 1,
         "Id": 0,
-        "name": "黄汴河：防洪能力50年一遇（复兴大道-金耀路治理）"
+        "name": "黄汴河：防洪能力50年一遇\n复兴大道-金耀路治理"
       }
     },
     {
@@ -38,15 +32,12 @@
       "id": 2,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.36692799255604,
-          34.800715742649913
-        ]
+        "coordinates": [114.36692799255604, 34.800715742649913]
       },
       "properties": {
         "FID": 2,
         "Id": 0,
-        "name": "东护城河：防洪能力20年一遇（东京大道-滨河路治理）"
+        "name": "东护城河：防洪能力20年一遇\n东京大道-滨河路治理"
       }
     },
     {
@@ -54,15 +45,12 @@
       "id": 3,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.3065736675949,
-          34.754700098241827
-        ]
+        "coordinates": [114.3065736675949, 34.754700098241827]
       },
       "properties": {
         "FID": 3,
         "Id": 0,
-        "name": "马家河：防洪能力20年一遇，马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
+        "name": "马家河：防洪能力20年一遇\n马家河入惠济河口至马家河西支口段，主要包括河道清淤疏浚15.336公里，两岸堤防加固30.672公里"
       }
     },
     {
@@ -70,15 +58,12 @@
       "id": 4,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.43312530118996,
-          34.735399338239148
-        ]
+        "coordinates": [114.43312530118996, 34.735399338239148]
       },
       "properties": {
         "FID": 4,
         "Id": 0,
-        "name": "惠济河：防洪能力50年一遇，城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
+        "name": "惠济河：防洪能力50年一遇\n城区段总长9.426km，河道进行开挖疏浚、堤防填筑"
       }
     },
     {
@@ -86,16 +71,13 @@
       "id": 5,
       "geometry": {
         "type": "Point",
-        "coordinates": [
-          114.19980182709216,
-          34.747306256290763
-        ]
+        "coordinates": [114.19980182709216, 34.747306256290763]
       },
       "properties": {
         "FID": 5,
         "Id": 0,
-        "name": "运粮河：防洪能力20年一遇，运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
+        "name": "运粮河：防洪能力20年一遇\n运粮河万隆乡四合村至杏花营农场新庄段进行了整治，总整治长度34.265公里"
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/assets/geojson/kaifeng/kaifengNatureWater.json b/src/assets/geojson/kaifeng/kaifengNatureWater.json
index 2ff002f..96b8e61 100644
--- a/src/assets/geojson/kaifeng/kaifengNatureWater.json
+++ b/src/assets/geojson/kaifeng/kaifengNatureWater.json
@@ -1 +1,53 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.33464588229256,34.79216861409467]},"properties":{"FID":0,"Id":0,"name":"包公湖（TSBGH），水面面积0.39km²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.34498226090189,34.807130664899333]},"properties":{"FID":1,"Id":0,"name":"龙亭湖（TSLTH），水面面积0.47km²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.33693016485816,34.81489722562236]},"properties":{"FID":2,"Id":0,"name":"西北湖（TSXBH），水面面积0.19km²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.36736823004473,34.815525403327904]},"properties":{"FID":3,"Id":0,"name":"铁塔湖（TSTTH），水面面积0.08km²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.36234280840043,34.805760095359972]},"properties":{"FID":4,"Id":0,"name":"阳光湖（TSYGH），水面面积0.11km²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.29255797602144,34.800449138394953]},"properties":{"FID":5,"Id":0,"name":"金明池（TSJMC），水面面积0.14km²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.24298904434796,34.807644628476581]},"properties":{"FID":6,"Id":0,"name":"中意湖（TSZYH），水面面积0.15km²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.27488333967011,34.890045363108491]},"properties":{"FID":7,"Id":0,"name":"黑岗口水库（TSHGKSK），水面面积2.78km²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.33464588229256, 34.79216861409467] },
+      "properties": { "FID": 0, "Id": 0, "name": "包公湖\n水面面积0.39km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.34498226090189, 34.807130664899333] },
+      "properties": { "FID": 1, "Id": 0, "name": "龙亭湖\n水面面积0.47km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.33693016485816, 34.81489722562236] },
+      "properties": { "FID": 2, "Id": 0, "name": "西北湖\n水面面积0.19km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.36736823004473, 34.815525403327904] },
+      "properties": { "FID": 3, "Id": 0, "name": "铁塔湖\n水面面积0.08km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.36234280840043, 34.805760095359972] },
+      "properties": { "FID": 4, "Id": 0, "name": "阳光湖\n水面面积0.11km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.29255797602144, 34.800449138394953] },
+      "properties": { "FID": 5, "Id": 0, "name": "金明池\n水面面积0.14km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.24298904434796, 34.807644628476581] },
+      "properties": { "FID": 6, "Id": 0, "name": "中意湖\n水面面积0.15km²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.27488333967011, 34.890045363108491] },
+      "properties": { "FID": 7, "Id": 0, "name": "黑岗口水库\n水面面积2.78km²" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengRainUse.json b/src/assets/geojson/kaifeng/kaifengRainUse.json
index 58596f7..3b691da 100644
--- a/src/assets/geojson/kaifeng/kaifengRainUse.json
+++ b/src/assets/geojson/kaifeng/kaifengRainUse.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.34471576126923,34.807244879027621]},"properties":{"FID":0,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.33672077228964,34.815144689566978]},"properties":{"FID":1,"Id":0,"name":"龙亭湖，汇水面积0.28km²，收集雨水4.5万吨/年"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.29246279758119,34.80039203133083]},"properties":{"FID":2,"Id":0,"name":"金明池，汇水面积0.17km²，收集雨水2.7万吨/年"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.24277965177946,34.807530414348321]},"properties":{"FID":3,"Id":0,"name":"中意湖，汇水面积0.22km²，收集雨水3.5万吨/年"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.34471576126923, 34.807244879027621] },
+      "properties": { "FID": 0, "Id": 0, "name": "龙亭湖，汇水面积0.28km²\n收集雨水4.5万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.33672077228964, 34.815144689566978] },
+      "properties": { "FID": 1, "Id": 0, "name": "西北湖，汇水面积0.14km²\n收集雨水2.2万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.29246279758119, 34.80039203133083] },
+      "properties": { "FID": 2, "Id": 0, "name": "金明池，汇水面积0.17km²\n收集雨水2.7万吨/年" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.24277965177946, 34.807530414348321] },
+      "properties": { "FID": 3, "Id": 0, "name": "中意湖，汇水面积0.22km²\n收集雨水3.5万吨/年" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
index 5587963..7b6a3ca 100644
--- a/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
+++ b/src/assets/geojson/kaifeng/kaifengShengHuoWS.json
@@ -1 +1,29 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.28123597781243,34.771350841956895]},"properties":{"FID":0,"Id":0,"name":"马家河污水处理厂，设计规模10万m³/日，实际处理7.54万m³/日"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.31521289637995,34.753686318314848]},"properties":{"FID":1,"Id":0,"name":"西区污水处理厂，设计规模12万m³/日，实际处理9.7万m³/日"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.38093674073218,34.772004765430317]},"properties":{"FID":2,"Id":0,"name":"东区污水处理厂，设计规模20万m³/日，实际处理20.7万m³/日"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.44667852780671,34.722484644433187]},"properties":{"FID":3,"Id":0,"name":"祥符区污水处理厂，设计规模4万m³/日，实际处理2.63万m³/日"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.28123597781243, 34.771350841956895] },
+      "properties": { "FID": 0, "Id": 0, "name": "马家河污水处理厂\n设计规模10万m³/日\n实际处理7.54万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.31521289637995, 34.753686318314848] },
+      "properties": { "FID": 1, "Id": 0, "name": "西区污水处理厂\n设计规模12万m³/日\n实际处理9.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.38093674073218, 34.772004765430317] },
+      "properties": { "FID": 2, "Id": 0, "name": "东区污水处理厂\n设计规模20万m³/日\n实际处理20.7万m³/日" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.44667852780671, 34.722484644433187] },
+      "properties": { "FID": 3, "Id": 0, "name": "祥符区污水处理厂\n设计规模4万m³/日\n实际处理2.63万m³/日" }
+    }
+  ]
+}
diff --git a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
index 2027bf0..ae6535d 100644
--- a/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
+++ b/src/assets/geojson/kaifeng/kaifengTouShuiArea.json
@@ -1 +1,65 @@
-{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"geometry":{"type":"Point","coordinates":[114.3154008016774,34.790398295106343]},"properties":{"FID":0,"Id":0,"name":"2022年示范区老旧小区改造（JZ01），透水铺装面积33970.63m²"}},{"type":"Feature","id":1,"geometry":{"type":"Point","coordinates":[114.32510900258119,34.786020086855615]},"properties":{"FID":1,"Id":0,"name":"环城公园一期城墙西南角绿化（GY01），透水铺装面积2881.53m²"}},{"type":"Feature","id":2,"geometry":{"type":"Point","coordinates":[114.22945467014681,34.795918644639869]},"properties":{"FID":2,"Id":0,"name":"综合保税产业园区基础设施建设（GY02），透水铺装面积55200m²"}},{"type":"Feature","id":3,"geometry":{"type":"Point","coordinates":[114.33710148605057,34.813069799569888]},"properties":{"FID":3,"Id":0,"name":"龙亭北路（金耀路—广济河）道路海绵化改造（DL13），透水铺装面积15945m²"}},{"type":"Feature","id":4,"geometry":{"type":"Point","coordinates":[114.33264713504767,34.813355334890595]},"properties":{"FID":4,"Id":0,"name":"人行道提升改造（DL12），透水铺装面积41715.70m²"}},{"type":"Feature","id":5,"geometry":{"type":"Point","coordinates":[114.35280592868905,34.781432486036373]},"properties":{"FID":5,"Id":0,"name":"南部片区雨污分流改造（GW04），透水铺装面积15406m²"}},{"type":"Feature","id":6,"geometry":{"type":"Point","coordinates":[114.37307893645874,34.793367862441613]},"properties":{"FID":6,"Id":0,"name":"汴京路（公园路-工农路）排水管网及道路海绵化改造（GW06），透水铺装面积20325.77m²"}},{"type":"Feature","id":7,"geometry":{"type":"Point","coordinates":[114.35137825208555,34.775721779622373]},"properties":{"FID":7,"Id":0,"name":"铁路北沿街（解放路—侯庄桥）道路海绵化改造（DL14），透水铺装面积14699.29m²"}},{"type":"Feature","id":8,"geometry":{"type":"Point","coordinates":[114.33259002798351,34.778177383380388]},"properties":{"FID":8,"Id":0,"name":"五福路（五一路—中山路）道路海绵化改（DL15），透水铺装面积12567.22m²"}},{"type":"Feature","id":9,"geometry":{"type":"Point","coordinates":[114.39792050935961,34.794681324916823]},"properties":{"FID":9,"Id":0,"name":"汴京路东郊沟雨水泵站新建（GW15），透水铺装面积137.05m²"}}]}
\ No newline at end of file
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 0,
+      "geometry": { "type": "Point", "coordinates": [114.3154008016774, 34.790398295106343] },
+      "properties": { "FID": 0, "Id": 0, "name": "2022年示范区老旧小区改造\n透水铺装面积33970.63m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [114.32510900258119, 34.786020086855615] },
+      "properties": { "FID": 1, "Id": 0, "name": "环城公园一期城墙西南角绿化\n透水铺装面积2881.53m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 2,
+      "geometry": { "type": "Point", "coordinates": [114.22945467014681, 34.795918644639869] },
+      "properties": { "FID": 2, "Id": 0, "name": "综合保税产业园区基础设施建设\n透水铺装面积55200m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 3,
+      "geometry": { "type": "Point", "coordinates": [114.33710148605057, 34.813069799569888] },
+      "properties": { "FID": 3, "Id": 0, "name": "龙亭北路道路海绵化改造\n透水铺装面积15945m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 4,
+      "geometry": { "type": "Point", "coordinates": [114.33264713504767, 34.813355334890595] },
+      "properties": { "FID": 4, "Id": 0, "name": "人行道提升改造\n透水铺装面积41715.70m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 5,
+      "geometry": { "type": "Point", "coordinates": [114.35280592868905, 34.781432486036373] },
+      "properties": { "FID": 5, "Id": 0, "name": "南部片区雨污分流改造\n透水铺装面积15406m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 6,
+      "geometry": { "type": "Point", "coordinates": [114.37307893645874, 34.793367862441613] },
+      "properties": { "FID": 6, "Id": 0, "name": "汴京路管网及道路海绵化改造\n透水铺装面积20325.77m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 7,
+      "geometry": { "type": "Point", "coordinates": [114.35137825208555, 34.775721779622373] },
+      "properties": { "FID": 7, "Id": 0, "name": "铁路北沿街道路海绵化改造\n透水铺装面积14699.29m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 8,
+      "geometry": { "type": "Point", "coordinates": [114.33259002798351, 34.778177383380388] },
+      "properties": { "FID": 8, "Id": 0, "name": "五福路道路海绵化改\n透水铺装面积12567.22m²" }
+    },
+    {
+      "type": "Feature",
+      "id": 9,
+      "geometry": { "type": "Point", "coordinates": [114.39792050935961, 34.794681324916823] },
+      "properties": { "FID": 9, "Id": 0, "name": "汴京路东郊沟雨水泵站新建\n透水铺装面积137.05m²" }
+    }
+  ]
+}
diff --git a/src/components/ImageFileUpload/index.vue b/src/components/ImageFileUpload/index.vue
index a247296..0955a68 100644
--- a/src/components/ImageFileUpload/index.vue
+++ b/src/components/ImageFileUpload/index.vue
@@ -117,19 +117,22 @@
       fileIndex = index;
     }
   });
+  uploadList.value.splice(fileIndex, 1);
+  props.saveFileArr.splice(fileIndex, 1);
+
   // id为空时做逻辑删除，不调用删除接口
-  let id = uploadList.value[fileIndex].id;
-  if (!!!id) {
-    uploadList.value.splice(fileIndex, 1);
-    props.saveFileArr.splice(fileIndex, 1);
-  } else {
-    let ids = [];
-    ids.push(id);
-    sysUploadDel(ids).then(res => {
-      uploadList.value.splice(fileIndex, 1);
-      props.saveFileArr.splice(fileIndex, 1);
-    });
-  }
+  // let id = uploadList.value[fileIndex].id;
+  // if (!!!id) {
+  //   uploadList.value.splice(fileIndex, 1);
+  //   props.saveFileArr.splice(fileIndex, 1);
+  // } else {
+  //   let ids = [];
+  //   ids.push(id);
+  //   sysUploadDel(ids).then(res => {
+  //     uploadList.value.splice(fileIndex, 1);
+  //     props.saveFileArr.splice(fileIndex, 1);
+  //   });
+  // }
 };
 // 文件方法预览
 const handlePictureCardPreview = file => {
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index 1707a00..e81aac9 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -178,7 +178,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(3);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
index 014c2dc..97c9878 100644
--- a/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
+++ b/src/views/sponeScreen/evaluationKH/chanChuJiXiao.vue
@@ -48,11 +48,6 @@
 import bus from '@/bus';
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 import kaifengFangHong from '@/assets/geojson/kaifeng/kaifengFangHong.json'; //防洪标准
-import kaifengRainUse from '@/assets/geojson/kaifeng/kaifengRainUse.json'; //雨水利用
-import kaifengTouShuiArea from '@/assets/geojson/kaifeng/kaifengTouShuiArea.json'; //透水面积
-import kaifengNatureWater from '@/assets/geojson/kaifeng/kaifengNatureWater.json'; //天然水域
-import kaifengShengHuoWS from '@/assets/geojson/kaifeng/kaifengShengHuoWS.json'; //生活污水
-import kaifengBOD from '@/assets/geojson/kaifeng/kaifengBOD.json'; //进水BOD
 import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
 import tuLi72X from '@/assets/newImgs/tuLi72X.png';
 
@@ -63,81 +58,50 @@
   { id: 'nlxc', name: '内涝消除' },
 ]);
 
-const curTab = ref('fhbz');
+const curTab = ref('');
 const quotaInfo = ref({ isCompliance: 1 }); //改造措施数据
 const tableData = ref([]);
 
 const tabClick = item => {
-  bus.emit('closeAllLayer');
   curTab.value = item.id;
-  if (curTab.value == 'fhbz') {
-    bus.emit('jhkhclick', 'fhbz');
-    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengFangHong', kaifengFangHong, tuLi72X, 20, 1); //图层名、图层geojson，图标，标注每行多少个字，行间距
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  } else if (curTab.value == 'nlbz') {
-    bus.emit('jhkhclick', 'nlbz');
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: false,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  } else {
-    bus.emit('jhkhclick', 'nlxc');
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: false,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
-  }
   getjb();
   getkhzn();
+  bus.emit('removeKHLayer'); //清除图层
+  if (curTab.value == 'fhbz') {
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengFangHong', kaifengFangHong, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.315, 34.802],
+        zoom: 11.2,
+      });
+    }, 1000);
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: true },
+      { layername: 'cesiumPaishuiArea2', show: true },
+    ]);
+  } else if (curTab.value == 'nlbz') {
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: true },
+      { layername: 'cesiumPaishuiArea2', show: false },
+    ]);
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.315, 34.802],
+        zoom: 11.2,
+      });
+    }, 200);
+  } else {
+    bus.emit('setIniteLayer', [
+      { layername: 'waterLoging', show: false },
+      { layername: 'cesiumPaishuiArea2', show: true },
+    ]);
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.295, 34.822],
+        zoom: 11.8,
+      });
+    }, 200);
+  }
 };
 
 // 产出绩效公共指标信息
@@ -158,21 +122,13 @@
   });
   if (res && res.code == 200) {
     tableData.value = res.data;
-    console.log('-----', tableData.value);
   }
 }
-//删除图层
-const removeSelectedLayer = layerList => {
-  layerList.forEach(element => {
-    if (newfiberMapbox.map.hasImage(element)) {
-      newfiberMapbox.map.removeImage(element);
-      newfiberMapBoxVectorLayer.removeByIds([element]);
-    }
-  });
-};
+
 onMounted(() => {
-  getjb();
-  getkhzn();
+  setTimeout(() => {
+    tabClick(tabList.value[0]);
+  });
 });
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
index e8cd155..1e3dffd 100644
--- a/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
+++ b/src/views/sponeScreen/evaluationKH/heiChouShuiTi.vue
@@ -51,15 +51,65 @@
         </div>
       </div>
     </div>
+
+    <!-- 地图水体点击弹窗 -->
+    <el-dialog v-model="dialogShow" :title="ExamineYearA + blackWaterNameA + '水质监测详情'" append-to-body width="900px">
+      <div class="hcstDialog">
+        <div class="part">
+          <div class="title">透明度(cm)</div>
+          <ChartBar3D :echartData="echartData1" class="chart" :key="refresh1"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">氨氮(mg/L)</div>
+          <ChartBar3D :key="refresh2" :echartData="echartData2" class="chart"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">溶解氧(mg/L)</div>
+          <ChartBar3D :key="refresh3" :echartData="echartData3" class="chart"></ChartBar3D>
+        </div>
+        <div class="part">
+          <div class="title">氧化还原电位(mV)</div>
+          <ChartBar3D :echartData="echartData4" class="chart" :key="refresh4"></ChartBar3D>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script setup>
 import bus from '@/bus';
+import { blackWaterInfoList, queryYearStatistic } from '@/api/spongePerformance/prevention';
+import ChartBar3D from '@/views/sponeScreen/Echarts/echartBar3D.vue';
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
-import { blackWaterInfoList } from '@/api/spongePerformance/prevention';
+import kaifengShengHuoWS from '@/assets/geojson/kaifeng/kaifengShengHuoWS.json'; //生活污水
+import kaifengBOD from '@/assets/geojson/kaifeng/kaifengBOD.json'; //进水BOD
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
+import tuLi72X from '@/assets/newImgs/tuLi72X.png';
 
 const { proxy } = getCurrentInstance();
-const hcdatas = ref('');
+const dialogShow = ref(false);
+const ExamineYearA = ref('');
+const blackWaterCodeA = ref('');
+const blackWaterNameA = ref('');
+const refresh1 = ref(1);
+const refresh2 = ref(1);
+const refresh3 = ref(1);
+const refresh4 = ref(1);
+const echartData1 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [126, 162, 119, 86, 113],
+});
+const echartData2 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [0.8, 0.35, 1.12, 0.9, 0.98],
+});
+const echartData3 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [5.4, 13, 9.2, 10.4, 8.9],
+});
+const echartData4 = ref({
+  // xAxis: ['3月', '4月', '9月', '11月'],
+  // seriesData: [126, 162, 119, 86, 113],
+});
 const tabs = ref([
   { id: 1, name: '黑臭水体' },
   { id: 2, name: '生活污水' },
@@ -73,82 +123,36 @@
 
 const tabClick = item => {
   curTab.value = item.id;
+  bus.emit('removeKHLayer'); //清除图层
   if (curTab.value == 1) {
-    bus.emit('jhkhclick', 'hcst');
     type.value = 'hcst';
-    addOdorousWaterBodies();
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    addOdorousWaterBodies(); //黑臭水体图层
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.803],
+        zoom: 11.9,
+      });
+    }, 500);
   } else if (curTab.value == 2) {
     type.value = 'shwssjl';
-    bus.emit('jhkhclick', 'shwssjl');
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    // 生活污水收集率
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengShengHuoWS', kaifengShengHuoWS, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.763],
+        zoom: 11.6,
+      });
+    }, 500);
   } else {
     type.value = 'cqjsbod';
-    bus.emit('jhkhclick', 'cqjsbod');
-    if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-      newfiberMapbox.map.removeImage('kaifengFangHong');
-      newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-    }
-    if (newfiberMapbox.map.getLayer('waterLine')) {
-      newfiberMapbox.map.removeLayer('waterLine');
-      newfiberMapbox.map.removeLayer('waterLabel');
-      newfiberMapbox.map.removeSource('waterLine');
-      newfiberMapbox.map.removeSource('waterLabel');
-    }
-    bus.emit('setIniteLayer', [
-      {
-        layername: 'waterLoging',
-        show: true,
-      },
-      {
-        layername: 'cesiumPaishuiArea2',
-        show: true,
-      },
-    ]);
-    newfiberMapbox.map.easeTo({
-      center: [114.315, 34.852],
-      zoom: 10.4,
-    });
+    // 进水BOD
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengBOD', kaifengBOD, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.365, 34.763],
+        zoom: 11.6,
+      });
+    }, 500);
   }
   getjb();
   getkhzn();
@@ -175,18 +179,11 @@
   }
 }
 
-// 黑臭基础信息 地图点击可查看监测详情
-async function getHc() {
-  let res = await blackWaterInfoList();
-  if (res && res.code == 200) {
-    hcdatas.value = res.data;
-  }
-}
 //地图渲染黑臭水体
 const addOdorousWaterBodies = async () => {
   // 飞哥 这=这里
   let params = {
-    examineYear: 2024,
+    examineYear: 2023,
   };
   let res = await blackWaterInfoList(params);
   console.log(res, 'ress');
@@ -242,13 +239,70 @@
     //newfiberMapbox.map.moveLayer('waterLine', 'odorousWaterBodies');
   }
 };
+
+// 点击黑臭水体查看监测指标详情
+const queryYearStatist = async () => {
+  let params = {
+    blackWaterCode: blackWaterCodeA.value,
+    sampleDate: ExamineYearA.value,
+  };
+  const res = await queryYearStatistic(params);
+  refresh1.value++;
+  refresh2.value++;
+  refresh3.value++;
+  refresh4.value++;
+  echartData1.value.xAxis = res.data.datelist;
+  echartData1.value.seriesData = res.data.tralist;
+  echartData2.value.xAxis = res.data.datelist;
+  echartData2.value.seriesData = res.data.nh3nlist;
+  echartData3.value.xAxis = res.data.datelist;
+  echartData3.value.seriesData = res.data.dolist;
+  echartData4.value.xAxis = res.data.datelist;
+  echartData4.value.seriesData = res.data.orplist;
+  // console.log(echartData1.value, '123');
+};
+
 onMounted(() => {
-  // getHc();
   getjb();
   getkhzn();
+  setTimeout(() => {
+    // 地图黑臭水体点击查看监测数据详情
+    newfiberMapbox.map.on('click', 'waterLine', e => {
+      let clickfeature = newfiberMapbox.map
+        .queryRenderedFeatures([
+          [e.point.x - 10 / 2, e.point.y - 10 / 2],
+          [e.point.x + 10 / 2, e.point.y + 10 / 2],
+        ])
+        // .filter(i => i.layer.id == 'odorousWaterBodies' || i.layer.id == 'waterLine');
+        .filter(i => i.layer.id == 'waterLine');
+      dialogShow.value = true;
+      blackWaterCodeA.value = clickfeature[0].properties.blackWaterCode;
+      blackWaterNameA.value = clickfeature[0].properties.blackWaterName;
+
+      queryYearStatist();
+      console.log('clickfeature', '点击事件11', clickfeature);
+      // emits('clicksWaterBodies', clickfeature[0].properties);
+    });
+  }, 5000);
 });
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
+.hcstDialog {
+  display: flex;
+  flex-wrap: wrap;
+  .part {
+    width: 48%;
+    margin-right: 2%;
+    .title {
+      font-size: 18px;
+      font-weight: bold;
+      color: #fff;
+    }
+    .chart {
+      height: 300px !important;
+    }
+  }
+}
 .chanChuJiXiao {
   width: 460px;
 
diff --git a/src/views/sponeScreen/evaluationKH/index.vue b/src/views/sponeScreen/evaluationKH/index.vue
index f5a6e6f..bf63034 100644
--- a/src/views/sponeScreen/evaluationKH/index.vue
+++ b/src/views/sponeScreen/evaluationKH/index.vue
@@ -33,7 +33,7 @@
 import xiangMuJianShe from './xiangMuJianShe'; //项目建设完成情况
 import ziJinJiXiao from './ziJinJiXiao'; //资金绩效评价
 import bus from '@/bus';
-import { onBeforeUnmount } from 'vue';
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
 
 const { proxy } = getCurrentInstance();
 const showPanel = ref(true); //面板展开收起
@@ -52,37 +52,38 @@
   { immediate: true }
 );
 
-onMounted(() => {});
-onBeforeUnmount(() => {
-  if (newfiberMapbox.map.hasImage('kaifengFangHong')) {
-    newfiberMapbox.map.removeImage('kaifengFangHong');
-    newfiberMapBoxVectorLayer.removeByIds(['kaifengFangHong']);
-  }
+//删除图层
+const removeSelectedLayer = () => {
+  let layerList = ['kaifengFangHong', 'kaifengRainUse', 'kaifengTouShuiArea', 'kaifengNatureWater', 'kaifengShengHuoWS', 'kaifengBOD'];
+  layerList.forEach(element => {
+    if (newfiberMapbox.map.hasImage(element)) {
+      newfiberMapbox.map.removeImage(element);
+      newfiberMapBoxVectorLayer.removeByIds([element]);
+    }
+  });
   if (newfiberMapbox.map.getLayer('waterLine')) {
     newfiberMapbox.map.removeLayer('waterLine');
     newfiberMapbox.map.removeLayer('waterLabel');
     newfiberMapbox.map.removeSource('waterLine');
     newfiberMapbox.map.removeSource('waterLabel');
   }
-  bus.emit('setIniteLayer', [
-    {
-      layername: 'sewageFactory',
-      show: true,
-    },
-    {
-      layername: 'waterLoging',
-      show: true,
-    },
-    {
-      layername: 'cesiumPaishuiArea2',
-      show: true,
-    },
-  ]);
-  newfiberMapbox.map.easeTo({
-    center: [114.315, 34.852],
-    zoom: 10.4,
+};
+
+onMounted(() => {
+  // 清除图层
+  bus.on('removeKHLayer', () => {
+    removeSelectedLayer();
   });
 });
+onBeforeUnmount(() => {
+  removeSelectedLayer(['kaifengFangHong', 'kaifengRainUse']);
+  bus.emit('setIniteLayer', [
+    { layername: 'sewageFactory', show: true },
+    { layername: 'waterLoging', show: true },
+    { layername: 'cesiumPaishuiArea2', show: true },
+  ]);
+  bus.off('removeKHLayer');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
index 4136405..c89d90d 100644
--- a/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
+++ b/src/views/sponeScreen/evaluationKH/keTouShuiMianJi.vue
@@ -48,6 +48,12 @@
   </div>
 </template>
 <script setup>
+import kaifengTouShuiArea from '@/assets/geojson/kaifeng/kaifengTouShuiArea.json'; //可透水面积
+import kaifengNatureWater from '@/assets/geojson/kaifeng/kaifengNatureWater.json'; //天然水域
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
+import tuLi72X from '@/assets/newImgs/tuLi72X.png';
+import bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
@@ -61,15 +67,30 @@
 
 const tabClick = item => {
   curTab.value = item.id;
-  if (curTab.value == 1) {
-    type.value = 'ktsdmmj';
-    bus.emit('jhkhclick', 'ktsdmmj');
-  } else {
-    bus.emit('jhkhclick', 'trsymj');
-    type.value = 'trsymj';
-  }
   getjb();
   getkhzn();
+  bus.emit('removeKHLayer'); //清除图层
+  if (curTab.value == 1) {
+    type.value = 'ktsdmmj';
+    // 可透水图层渲染
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengTouShuiArea', kaifengTouShuiArea, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.345, 34.803],
+        zoom: 13.0,
+      });
+    }, 500);
+  } else {
+    type.value = 'trsymj';
+    // 天然水域图层渲染
+    newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengNatureWater', kaifengNatureWater, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+    setTimeout(() => {
+      newfiberMapbox.map.easeTo({
+        center: [114.345, 34.808],
+        zoom: 13.4,
+      });
+    }, 500);
+  }
 };
 const type = ref('ktsdmmj');
 
diff --git a/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue b/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
index cc9467a..4e9557c 100644
--- a/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
+++ b/src/views/sponeScreen/evaluationKH/xiangMuJianShe.vue
@@ -9,13 +9,13 @@
             <el-progress
               :text-inside="true"
               :stroke-width="20"
-              :percentage="Math.round((jhtrhmzj.reformAchievement / jhtrhmzj.quotaTarget) * 100)"
+              :percentage="Math.round((jhkgxm.reformAchievement / jhkgxm.quotaTarget) * 100)"
               status="success"
             ></el-progress>
-            <p class="title2">{{ jhtrhmzj.quotaTarget }}</p>
+            <p class="title2">{{ jhkgxm.quotaTarget }}</p>
             <div class="progressunit">
               <div class="title">（单位：个）</div>
-              <div class="title2">{{ jhtrhmzj.remark }}</div>
+              <div class="title2">{{ jhkgxm.remark }}</div>
             </div>
           </div>
         </div>
@@ -137,7 +137,7 @@
 </script>
 <style lang="scss" scoped>
 .xiangMuJianShe {
-  margin: 10px 0px;
+  margin: 5px 0px;
   width: 460px;
 
   .ListBoxBody {
@@ -149,7 +149,9 @@
     .planCont {
       margin: 5px auto;
       font-size: 13px;
-
+      .list {
+        margin-top: -12px;
+      }
       .activePlan {
         background: #3ce6ff;
       }
@@ -159,7 +161,7 @@
         margin-bottom: 5px;
         align-items: center;
         width: 100%;
-        margin-top: -5px;
+        margin-top: -10px;
         font-size: 14px;
 
         .title {
@@ -209,6 +211,7 @@
       border-radius: 3px;
       height: 40px;
       padding: 0 10px;
+      font-size: 18px;
 
       .titles {
         width: 50px;
@@ -227,7 +230,7 @@
 
       .vals {
         color: #ff5e66;
-        font-size: 14px;
+        margin-left: 20px;
       }
       .colors1 {
         color: #00fe00;
diff --git a/src/views/sponeScreen/evaluationKH/yuShuiZiYuanHua.vue b/src/views/sponeScreen/evaluationKH/yuShuiZiYuanHua.vue
index 4bcdc34..5c0b6f6 100644
--- a/src/views/sponeScreen/evaluationKH/yuShuiZiYuanHua.vue
+++ b/src/views/sponeScreen/evaluationKH/yuShuiZiYuanHua.vue
@@ -17,13 +17,13 @@
           <div class="titles titlesmb">
             <div class="mbs">目标</div>
           </div>
-          <div class="valsText" :title="quotaInfo.improveGoals">{{ quotaInfo.improveGoals }}</div>
+          <div class="valsText">{{ quotaInfo.improveGoals }}</div>
         </div>
         <div class="measures flex flex-j-left flex-align-center">
           <div class="titles titlecs">
             <div class="mbs">措施</div>
           </div>
-          <div class="valsText" :title="quotaInfo.reformMethod">{{ quotaInfo.reformMethod }}</div>
+          <div class="valsText">{{ quotaInfo.reformMethod }}</div>
         </div>
         <el-table ref="table" :data="tableData" max-height="120">
           <el-table-column label="改造工程" prop="reformProjectName" show-overflow-tooltip />
@@ -46,15 +46,31 @@
   </div>
 </template>
 <script setup>
+import kaifengRainUse from '@/assets/geojson/kaifeng/kaifengRainUse.json'; //雨水利用
+import newfiberMapBoxVectorLayer from '@/views/sponeScreen/gisMF/mapboxVectorLayer.js';
+import tuLi72X from '@/assets/newImgs/tuLi72X.png';
+import bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 import { quotaCommomInfoList, hmyztQuotaDataList } from '@/api/sponeScreen/jxkh.js';
 
 const quotaInfo = ref({}); //改造措施数据
 const tableData = ref([]);
-const tabList = ref([{ id: 1, name: '雨水资源化利用' }]);
-const curTab = ref(1);
+const tabList = ref([{ id: '1', name: '雨水资源化利用' }]);
+const curTab = ref('1');
 const tabClick = item => {
   curTab.value = item.id;
+  getjb();
+  getkhzn();
+  // 渲染图层
+  bus.emit('removeKHLayer'); //清除图层
+  newfiberMapBoxVectorLayer.addGeojsonSymbol('kaifengRainUse', kaifengRainUse, tuLi72X, 20, 1.3); //图层名、图层geojson，图标，标注每行多少个字，行间距
+  setTimeout(() => {
+    newfiberMapbox.map.easeTo({
+      center: [114.305, 34.802],
+      zoom: 12.2,
+    });
+  }, 500);
 };
 
 // 产出绩效公共指标信息
@@ -86,7 +102,7 @@
 <style lang="scss" scoped>
 .rainLYPage {
   width: 460px;
-  margin: 10px auto;
+  margin: 5px auto;
   .ConstrucClass {
     background: rgba(8, 75, 125, 1);
     padding: 10px;