diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 9bfb855..ce15c3f 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -17,7 +17,7 @@
 <script setup name="streetscape">
 import { ref, reactive, toRefs, onMounted, nextTick, defineProps, watch } from "vue";
 // import bus from "@/bus";
-// import request from "@/utils/request";
+import request from "@/utils/request";
 import axios from "axios";
 const props = defineProps({
   // 数据id
@@ -50,19 +50,19 @@
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
 
-  let poiData = await axios({
+  let poiData = await request({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
       location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
         AllData.poiCircle[0].toFixed(6)
       )}`,
-      radius: 1000,
+      radius: 100,
       query: "公交站$商场$著名景点$学校",
     },
   });
-  if (poiData && poiData.data.data.length) {
-    AllData.poiData = poiData.data.data;
+  if (poiData && poiData.data.length) {
+    AllData.poiData = poiData.data;
     getStreetImg();
   }
 };
@@ -71,7 +71,7 @@
   AllData.poiImages = [];
   console.log("AllData.poiData---", AllData.poiData);
   AllData.poiData.forEach(async (element) => {
-    let data = await axios({
+    let data = await request({
       url: `/bdApi/baiduservice/panorama`,
       method: "GET",
       params: {
@@ -81,13 +81,15 @@
         width: 512,
       },
     });
-    if (data.data && data.data.data && data.data.data.status == 200) {
-      data.data.data.base64 = "data:image/jpeg;base64," + data.data.data.base64;
+    debugger;
+    if (data && data.data && data.data.status == 200) {
+      data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
       AllData.poiImages.push({
         name: element.name,
         lonlat: [element.location.lng, element.location.lat],
-        imagesUrl: data.data.data.base64,
+        imagesUrl: data.data.base64,
       });
+      selectPoiImgUrl(AllData.poiImages[0]);
     }
   });
   console.log("AllData.poiImages---", AllData.poiImages);

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 9bfb855..ce15c3f 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -17,7 +17,7 @@
 <script setup name="streetscape">
 import { ref, reactive, toRefs, onMounted, nextTick, defineProps, watch } from "vue";
 // import bus from "@/bus";
-// import request from "@/utils/request";
+import request from "@/utils/request";
 import axios from "axios";
 const props = defineProps({
   // 数据id
@@ -50,19 +50,19 @@
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
 
-  let poiData = await axios({
+  let poiData = await request({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
       location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
         AllData.poiCircle[0].toFixed(6)
       )}`,
-      radius: 1000,
+      radius: 100,
       query: "公交站$商场$著名景点$学校",
     },
   });
-  if (poiData && poiData.data.data.length) {
-    AllData.poiData = poiData.data.data;
+  if (poiData && poiData.data.length) {
+    AllData.poiData = poiData.data;
     getStreetImg();
   }
 };
@@ -71,7 +71,7 @@
   AllData.poiImages = [];
   console.log("AllData.poiData---", AllData.poiData);
   AllData.poiData.forEach(async (element) => {
-    let data = await axios({
+    let data = await request({
       url: `/bdApi/baiduservice/panorama`,
       method: "GET",
       params: {
@@ -81,13 +81,15 @@
         width: 512,
       },
     });
-    if (data.data && data.data.data && data.data.data.status == 200) {
-      data.data.data.base64 = "data:image/jpeg;base64," + data.data.data.base64;
+    debugger;
+    if (data && data.data && data.data.status == 200) {
+      data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
       AllData.poiImages.push({
         name: element.name,
         lonlat: [element.location.lng, element.location.lat],
-        imagesUrl: data.data.data.base64,
+        imagesUrl: data.data.base64,
       });
+      selectPoiImgUrl(AllData.poiImages[0]);
     }
   });
   console.log("AllData.poiImages---", AllData.poiImages);
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index d732a0b..e910189 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -150,16 +150,21 @@
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if (filterList.value.length == 0)
       bus.emit('geoRegeo', {
         name: value,
         callback: results => {
-          filterList.value = results.geocodes.map((i, idx) => ({
-            id: idx,
-            name: i.formatted_address,
-            geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-            pointTypeName: '地理位置',
-          }));
+          if(!results.geocodes) return;
+          roadData.value = [
+            {
+              data:results.geocodes.map((i, idx) => ({
+                id: idx,
+                name: i.formatted_address,
+                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+                pointTypeName: '地理位置',
+              }))
+            }
+          ];
+          console.log('roadData.value',roadData.value);
         },
       });
   } else {

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 9bfb855..ce15c3f 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -17,7 +17,7 @@
 <script setup name="streetscape">
 import { ref, reactive, toRefs, onMounted, nextTick, defineProps, watch } from "vue";
 // import bus from "@/bus";
-// import request from "@/utils/request";
+import request from "@/utils/request";
 import axios from "axios";
 const props = defineProps({
   // 数据id
@@ -50,19 +50,19 @@
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
 
-  let poiData = await axios({
+  let poiData = await request({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
       location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
         AllData.poiCircle[0].toFixed(6)
       )}`,
-      radius: 1000,
+      radius: 100,
       query: "公交站$商场$著名景点$学校",
     },
   });
-  if (poiData && poiData.data.data.length) {
-    AllData.poiData = poiData.data.data;
+  if (poiData && poiData.data.length) {
+    AllData.poiData = poiData.data;
     getStreetImg();
   }
 };
@@ -71,7 +71,7 @@
   AllData.poiImages = [];
   console.log("AllData.poiData---", AllData.poiData);
   AllData.poiData.forEach(async (element) => {
-    let data = await axios({
+    let data = await request({
       url: `/bdApi/baiduservice/panorama`,
       method: "GET",
       params: {
@@ -81,13 +81,15 @@
         width: 512,
       },
     });
-    if (data.data && data.data.data && data.data.data.status == 200) {
-      data.data.data.base64 = "data:image/jpeg;base64," + data.data.data.base64;
+    debugger;
+    if (data && data.data && data.data.status == 200) {
+      data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
       AllData.poiImages.push({
         name: element.name,
         lonlat: [element.location.lng, element.location.lat],
-        imagesUrl: data.data.data.base64,
+        imagesUrl: data.data.base64,
       });
+      selectPoiImgUrl(AllData.poiImages[0]);
     }
   });
   console.log("AllData.poiImages---", AllData.poiImages);
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index d732a0b..e910189 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -150,16 +150,21 @@
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if (filterList.value.length == 0)
       bus.emit('geoRegeo', {
         name: value,
         callback: results => {
-          filterList.value = results.geocodes.map((i, idx) => ({
-            id: idx,
-            name: i.formatted_address,
-            geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-            pointTypeName: '地理位置',
-          }));
+          if(!results.geocodes) return;
+          roadData.value = [
+            {
+              data:results.geocodes.map((i, idx) => ({
+                id: idx,
+                name: i.formatted_address,
+                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+                pointTypeName: '地理位置',
+              }))
+            }
+          ];
+          console.log('roadData.value',roadData.value);
         },
       });
   } else {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 45c2f01..95cce10 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -22,47 +22,42 @@
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖水情"
+                ? "排水户统计"
                 : AllData.regionGrade == "two"
-                ? "管网监测"
+                ? "排水户统计"
                 : AllData.regionGrade == "three"
-                ? "管网统计"
+                ? "排水户统计"
                 : AllData.regionGrade == "four"
-                ? "当日水量分析"
+                ? "水量统计"
                 : ""
             }}
             {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
           </div>
           <div class="modularBody">
-            <DraBarCharts2Y
-              v-if="
+            <!-- v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
-              "
+              " -->
+            <DraBarCharts2Y
               :data="AllData.chartData1"
               :refresh="AllData.refresh1"
               :ClickData="AllData.ClickData1"
             ></DraBarCharts2Y>
-            <DraBarChartsLeft
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData2"
-              :refresh="AllData.refresh2"
-              :ClickData="AllData.ClickData2"
-            ></DraBarChartsLeft>
           </div>
         </div>
         <div class="modular2">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "流域管网"
+                ? "管网统计"
                 : AllData.regionGrade == "two"
                 ? "管网统计"
                 : AllData.regionGrade == "three"
-                ? "当日水量分析"
+                ? "排水类别"
                 : AllData.regionGrade == "four"
-                ? "渍水风险点"
+                ? "排水类别"
                 : ""
             }}
             {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -72,32 +67,26 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
               "
               :data="AllData.chartData2"
               :refresh="AllData.refresh2"
               :ClickData="AllData.ClickData2"
             ></DraBarChartsLeft>
-
-            <DraBarCharts2Y
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData1"
-              :refresh="AllData.refresh1"
-              :ClickData="AllData.ClickData1"
-            ></DraBarCharts2Y>
           </div>
         </div>
         <div class="modular3">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "two"
-                ? "湖泊排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "three"
-                ? "渍水风险点"
+                ? "水量统计(日)"
                 : AllData.regionGrade == "four"
-                ? "历史风险"
+                ? "管网统计"
                 : ""
             }}
             {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -107,18 +96,13 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
-                AllData.regionGrade == 'three'
+                AllData.regionGrade == 'three' ||
+                AllData.regionGrade == 'four'
               "
               :data="AllData.chartData3"
               :refresh="AllData.refresh3"
               :ClickData="AllData.ClickData3"
             ></DraBarCharts2Y>
-            <DraLineChartsLeft
-              v-if="AllData.regionGrade == 'four'"
-              :data="AllData.chartData3"
-              :refresh="AllData.refresh3"
-              :ClickData="AllData.ClickData3"
-            />
           </div>
         </div></div
     ></Transition>
@@ -142,12 +126,12 @@
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
             <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
+            <div class="SLList">
               <div class="SlList1P">
                 <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">上游水量</div>
+              <div class="SlList2P">收水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
@@ -156,13 +140,6 @@
               </div>
               <div class="SlList2P">当前站点水量</div>
             </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <span class="SlListNum">{{ AllData.SLFX.downstreamSiteWaterYield }}</span>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">下游水量</div>
-            </div>
           </div>
         </div>
         <div class="modular3_right">
@@ -388,7 +365,6 @@
   ClickData3: "dgtxg",
   GWBD: {},
   SLFX: {},
-  isJBK: true, //是否为接驳口
   chartDataRight: {
     yAxis: [],
     yAxis_Name: "降雨量",
@@ -457,8 +433,8 @@
 
     // 切换时进行数据请求,默认视角请求
     getData1();
+    getData2();
     getData3();
-    getData7();
   }
   if (item.sort == 1) {
     bus.emit("panelDataToMap", {
@@ -513,9 +489,9 @@
     };
 
     // 切换时进行数据请求,默认视角请求
-    getData1();
+    getData2();
+    getData3();
     getData4();
-    getData5();
   }
   if (item.sort == 3) {
     bus.emit("panelDataToMap", {
@@ -530,9 +506,9 @@
       sort: 4,
     };
 
-    getData2();
+    getData3();
+    getData1();
     getData4();
-    getData5();
   }
   if (item.sort == 4) {
     bus.emit("panelDataToMap", {
@@ -571,7 +547,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +556,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +565,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +574,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -628,15 +604,15 @@
         } else if (AllData.regionGrade == "three") {
           // 三级
           console.log("三级");
-          getData1();
+          getData2();
+          getData3();
           getData4();
-          getData5();
         } else if (AllData.regionGrade == "four") {
           // 四级
           console.log("四级");
-          getData2();
+          getData3();
+          getData1();
           getData4();
-          getData5();
         } else {
           // 五级  五级为排水单元,由上可知,因为没有pid 所以此方法无效
           console.log("五级");
@@ -663,14 +639,6 @@
             AllData.GWBD = res.data[0];
           }
         });
-        //   根据type 判断是管井还是接驳口
-        if (Row.properties.type == "rainwater_pipeline_quality_area1") {
-          // 接驳口
-          AllData.isJBK = true;
-        } else {
-          // 管井或其他
-          AllData.isJBK = false;
-        }
         //   上下游水量分析
         getDataSXY(Row.properties);
         //   获取echarts数据
@@ -723,7 +691,7 @@
     sort: 4,
   };
 };
-// 获取数据 徐云欣  一级界面的流域管网/二级界面的管网统计/三级界面的管网统计
+// 获取数据 徐云欣  一级界面的管网统计/二级界面的管网统计/四级界面的管网统计
 const getData1 = () => {
   MonitorAPI.pipelineProblemStatistic({
     regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
@@ -733,7 +701,14 @@
     if (res && res.code == 200) {
       if (AllData.regionGrade == "one") {
         // 一级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
+        AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
@@ -742,288 +717,200 @@
       if (AllData.regionGrade == "two") {
         // 二级Ecahrts 名称
         AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
         AllData.TjData2Unit = "km";
       }
-      if (AllData.regionGrade == "three") {
-        // 三级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
-        AllData.TjData1 = res.data.pipelineLengthList
+      if (AllData.regionGrade == "four") {
+        AllData.chartData3.xAxis = res.data.problemNameList; //X轴数据
+        AllData.chartData3.y1_Unit = "km"; //Y轴单位
+        AllData.chartData3.y2_Unit = ""; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = res.data.pipelineProblemLengthList; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "片区管网问题"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = res.data.pipelineProblemLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(2);
-        AllData.TjData1Unit = "km";
+          .toFixed(0);
+        AllData.TjData3Unit = "km";
+        // // 二级Ecahrts 名称
+        // AllData.chartData2.yAxis_Name = "问题管网";
+        // //   数据赋值
+        // AllData.chartData2.xAxis = res.data.regionNameList;
+        // AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        // AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        // AllData.chartData2.yAxis2_Name = "总长度";
+        // AllData.chartData2.y1_Unit = "km";
+        // AllData.refresh2++;
+        // AllData.TjData2 = res.data.pipelineLengthList
+        //   .reduce((accu, curren) => Number(accu) + Number(curren))
+        //   .toFixed(2);
+        // AllData.TjData2Unit = "km";
       }
-      //   数据赋值
-      AllData.chartData2.xAxis = res.data.regionNameList;
-      AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
-      AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
-      AllData.chartData2.yAxis2_Name = "总长度";
-      AllData.chartData2.y1_Unit = "km";
-      AllData.refresh2++;
     }
   });
 };
-
-// 获取数据 徐云欣  二级界面的管网监测/四级界面的历史风险
+// 获取数据 刘芳阳  一级界面的污水水量(日)/二级界面的污水水量(日)/三级界面的水量统计(日)/四级界面的排水量
 const getData2 = () => {
-  MonitorAPI.pipelineRunRiskStatistic({
-    regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
-    regionName: AllData.regionName, //分区名称
-    regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-    // startTime: "", //开始时间（仅历史风险需要用到）
-    // endTime: "", //结束时间（仅历史风险需要用到）
+  MonitorAPI.sewageWaterRegionWaterYieldAnalysis({
+    sewageWaterRegionId: AllData.waterRegionCode ? AllData.waterRegionCode : 0,
   }).then((res) => {
     if (res && res.code == 200) {
+      let XData = []; //片区名称
+      let data1 = []; //站点数
+      let data2 = []; //进水量
+      let data3 = []; //出水量
+      res.data.forEach((element) => {
+        XData.push(element.waterRegionName);
+        data1.push(element.siteNum);
+        data2.push(element.inWaterYield);
+        data3.push(element.outWaterYield);
+      });
+      if (AllData.regionGrade == "one" || AllData.regionGrade == "three") {
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
       if (AllData.regionGrade == "two") {
-        AllData.chartData1.xAxis = res.data.regionNameList; //X轴数据
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = data3; //数据2
+        AllData.chartData3.yAxis2_bar_Name = "出水量"; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨  一级界面的排水户统计/ 二级界面的排水户统计/ 三级界面的排水户统计
+const getData3 = () => {
+  MonitorAPI.queryDrainageUserInfo({
+    regionId: AllData.waterRegionCode,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      if (
+        AllData.regionGrade == "one" ||
+        AllData.regionGrade == "two" ||
+        AllData.regionGrade == "three"
+      ) {
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = res.data.pipelinePointCount; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageNumber; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "排水户"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = res.data.pipelineRunRiskPointCount; //数据2
-        AllData.chartData1.yAxis2_bar_Name = "运行风险数"; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.keyDrainageNumber; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "重点排水户"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "";
-        AllData.chartData1.yAxis2_line_Index = 0;
+        AllData.chartData1.yAxis2_line = res.data.rtuNumber;
+        AllData.chartData1.yAxis2_line_Name = "监测设备";
+        AllData.chartData1.yAxis2_line_Index = 1;
         AllData.chartData1.yAxis3_line = null;
         AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = res.data.pipelinePointCount
+        AllData.TjData1 = res.data.drainageNumber
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(0);
         AllData.TjData1Unit = "个";
       }
       if (AllData.regionGrade == "four") {
-        // AllData.chartData3.xAxis = res.data.regionNameList;
-        // AllData.chartData3.yAxis = res.data.overFlowRiskTimesList; //溢流风险
-        // AllData.chartData3.yAxis2 = res.data.fullPipeTimesList; //满管风险
-        // AllData.chartData3.yAxis_Name = "溢流风险";
-        // AllData.chartData3.yAxis2_Name = "满管风险";
-        // AllData.refresh3++;
-        AllData.chartData3.xAxis = res.data.regionNameList;
-        AllData.chartData3.yAxis1_bar = null;
-        AllData.chartData3.yAxis1_bar_Name = "";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis2_line = res.data.fullPipeTimesList;
-        AllData.chartData3.yAxis2_line_Name = "满管";
-        AllData.chartData3.yAxis2_line_Index = 0;
-        AllData.chartData3.yAxis3_line = res.data.overFlowRiskTimesList;
-        AllData.chartData3.yAxis3_line_Name = "溢流";
-        AllData.chartData3.yAxis3_line_Index = 0;
-        AllData.chartData3.y1_Unit = "次"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-        AllData.TjData3 = null;
-        AllData.TjData3Unit = null;
-      }
-    }
-  });
-};
-
-// 获取数据 谢杨  一级界面的河湖排口/ 二级界面的河湖排口
-const getData3 = () => {
-  MonitorAPI.outletList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.inflowWater;
-        AllData.chartData3.yAxis1_bar_Name = "进水量";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.outletsNumber;
-        AllData.chartData3.yAxis3_line_Name = "排口";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        AllData.refresh3++;
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "two") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.outletsNumber;
-        AllData.chartData3.yAxis1_bar_Name = "排口";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.inflowWater;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        // nextTick(() => {
-        //   debugger;
-        AllData.refresh3++;
-        // }, 1000);
-
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢杨  三级界面的渍水风险点/ 四级界面的渍水风险点
-const getData4 = () => {
-  //
-  MonitorAPI.pointList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "three") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.pointNumber;
-        AllData.chartData3.yAxis1_bar_Name = "渍水风险点";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "风险排口";
-        AllData.chartData3.yAxis3_line = null;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-
-        AllData.TjData3 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        //
-        AllData.chartData2.xAxis = res.data.partitionName;
-        AllData.chartData2.yAxis = null;
-        AllData.chartData2.yAxis2 = res.data.pointNumber;
-        AllData.chartData2.yAxis2_Name = "数量";
-        AllData.chartData2.yAxis_Name = null;
-        AllData.chartData2.y1_Unit = "个";
-        AllData.refresh2++;
-
-        AllData.TjData2 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢扬 一级界面的河湖水情
-const getData7 = () => {
-  MonitorAPI.queryWaterLevel({}).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        let XData = [];
-        let data1 = []; //当前水位
-        let data2 = []; //设防水位
-        let data3 = []; //调蓄容积
-        res.data.forEach((element) => {
-          XData.push(element.lakeName);
-          data1.push(element.nowWaterlevel);
-          data2.push(element.bestPromitWaterlevel);
-          data3.push(element.volume);
-        });
-        AllData.chartData1.xAxis = XData; //X轴数据
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData1.y2_Unit = "m"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = data3; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageVolume; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "可排水量"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = data2;
-        AllData.chartData1.yAxis2_line_Name = "控制水位";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = data1;
-        AllData.chartData1.yAxis3_line_Name = "当前水位";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-        AllData.TjData1 = null;
-        AllData.TjData1Unit = null;
-      }
-    }
-  });
-};
-// 获取数据 刘芳阳  / 三级 当日水量分析 /四级当日水量分析
-const getData5 = () => {
-  MonitorAPI.waterRegionWaterYieldAnalysis({
-    waterRegionId: AllData.waterRegionCode,
-  }).then((res) => {
-    if (res && res.code == 200) {
-      let XData = [];
-      let YData1 = [];
-      let YData2 = [];
-      let YData3 = [];
-      res.data.forEach((element) => {
-        XData.push(element.waterRegionName); //X轴数据
-        YData1.push(element.siteNum); //点位数量
-        YData2.push(element.inWaterYield); //进水
-        YData3.push(element.outWaterYield); //出水
-      });
-      if (AllData.regionGrade == "three") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = YData2;
-        AllData.chartData1.yAxis2_line_Name = "进水";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-
-        AllData.TjData2 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "接驳点数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.realTimeDrainage; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "实时排水量"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
         AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "进水";
+        AllData.chartData1.yAxis2_line_Name = "";
         AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
+        AllData.chartData1.yAxis3_line = null;
+        AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
+        AllData.TjData1 = res.data.drainageVolume
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData1Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨   三级界面的排水类别/四级界面的排水类别
+const getData4 = () => {
+  MonitorAPI.queryDrainageType({ regionId: AllData.waterRegionCode }).then((res) => {
+    if (res && res.code == 200) {
+      if (AllData.regionGrade == "three" || AllData.regionGrade == "four") {
+        // 三级Ecahrts 名称
+        AllData.chartData2.xAxis = res.data.typeName;
+        AllData.chartData2.yAxis = null;
+        AllData.chartData2.yAxis_Name = "";
+        AllData.chartData2.yAxis2 = res.data.typeNumber;
+        AllData.chartData2.yAxis2_Name = "数量";
+        AllData.chartData2.y1_Unit = "个";
+        AllData.refresh2++;
+        AllData.TjData1 = res.data.typeNumber
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(2);
         AllData.TjData1Unit = "个";
       }
+      //   数据赋值
     }
   });
 };
@@ -1129,8 +1016,8 @@
     if (!newfiberMap) return;
     bus.on("FenQuClick", FenQuClick);
     getData1();
+    getData2();
     getData3();
-    getData7();
     clearInterval(initeGLTimer);
   }, 100);
 });
@@ -1207,6 +1094,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
+        background-repeat: no-repeat;
+        background-size: contain;
 
         .SlList1P {
           width: 100%;

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 9bfb855..ce15c3f 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -17,7 +17,7 @@
 <script setup name="streetscape">
 import { ref, reactive, toRefs, onMounted, nextTick, defineProps, watch } from "vue";
 // import bus from "@/bus";
-// import request from "@/utils/request";
+import request from "@/utils/request";
 import axios from "axios";
 const props = defineProps({
   // 数据id
@@ -50,19 +50,19 @@
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
 
-  let poiData = await axios({
+  let poiData = await request({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
       location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
         AllData.poiCircle[0].toFixed(6)
       )}`,
-      radius: 1000,
+      radius: 100,
       query: "公交站$商场$著名景点$学校",
     },
   });
-  if (poiData && poiData.data.data.length) {
-    AllData.poiData = poiData.data.data;
+  if (poiData && poiData.data.length) {
+    AllData.poiData = poiData.data;
     getStreetImg();
   }
 };
@@ -71,7 +71,7 @@
   AllData.poiImages = [];
   console.log("AllData.poiData---", AllData.poiData);
   AllData.poiData.forEach(async (element) => {
-    let data = await axios({
+    let data = await request({
       url: `/bdApi/baiduservice/panorama`,
       method: "GET",
       params: {
@@ -81,13 +81,15 @@
         width: 512,
       },
     });
-    if (data.data && data.data.data && data.data.data.status == 200) {
-      data.data.data.base64 = "data:image/jpeg;base64," + data.data.data.base64;
+    debugger;
+    if (data && data.data && data.data.status == 200) {
+      data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
       AllData.poiImages.push({
         name: element.name,
         lonlat: [element.location.lng, element.location.lat],
-        imagesUrl: data.data.data.base64,
+        imagesUrl: data.data.base64,
       });
+      selectPoiImgUrl(AllData.poiImages[0]);
     }
   });
   console.log("AllData.poiImages---", AllData.poiImages);
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index d732a0b..e910189 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -150,16 +150,21 @@
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if (filterList.value.length == 0)
       bus.emit('geoRegeo', {
         name: value,
         callback: results => {
-          filterList.value = results.geocodes.map((i, idx) => ({
-            id: idx,
-            name: i.formatted_address,
-            geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-            pointTypeName: '地理位置',
-          }));
+          if(!results.geocodes) return;
+          roadData.value = [
+            {
+              data:results.geocodes.map((i, idx) => ({
+                id: idx,
+                name: i.formatted_address,
+                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+                pointTypeName: '地理位置',
+              }))
+            }
+          ];
+          console.log('roadData.value',roadData.value);
         },
       });
   } else {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 45c2f01..95cce10 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -22,47 +22,42 @@
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖水情"
+                ? "排水户统计"
                 : AllData.regionGrade == "two"
-                ? "管网监测"
+                ? "排水户统计"
                 : AllData.regionGrade == "three"
-                ? "管网统计"
+                ? "排水户统计"
                 : AllData.regionGrade == "four"
-                ? "当日水量分析"
+                ? "水量统计"
                 : ""
             }}
             {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
           </div>
           <div class="modularBody">
-            <DraBarCharts2Y
-              v-if="
+            <!-- v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
-              "
+              " -->
+            <DraBarCharts2Y
               :data="AllData.chartData1"
               :refresh="AllData.refresh1"
               :ClickData="AllData.ClickData1"
             ></DraBarCharts2Y>
-            <DraBarChartsLeft
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData2"
-              :refresh="AllData.refresh2"
-              :ClickData="AllData.ClickData2"
-            ></DraBarChartsLeft>
           </div>
         </div>
         <div class="modular2">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "流域管网"
+                ? "管网统计"
                 : AllData.regionGrade == "two"
                 ? "管网统计"
                 : AllData.regionGrade == "three"
-                ? "当日水量分析"
+                ? "排水类别"
                 : AllData.regionGrade == "four"
-                ? "渍水风险点"
+                ? "排水类别"
                 : ""
             }}
             {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -72,32 +67,26 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
               "
               :data="AllData.chartData2"
               :refresh="AllData.refresh2"
               :ClickData="AllData.ClickData2"
             ></DraBarChartsLeft>
-
-            <DraBarCharts2Y
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData1"
-              :refresh="AllData.refresh1"
-              :ClickData="AllData.ClickData1"
-            ></DraBarCharts2Y>
           </div>
         </div>
         <div class="modular3">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "two"
-                ? "湖泊排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "three"
-                ? "渍水风险点"
+                ? "水量统计(日)"
                 : AllData.regionGrade == "four"
-                ? "历史风险"
+                ? "管网统计"
                 : ""
             }}
             {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -107,18 +96,13 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
-                AllData.regionGrade == 'three'
+                AllData.regionGrade == 'three' ||
+                AllData.regionGrade == 'four'
               "
               :data="AllData.chartData3"
               :refresh="AllData.refresh3"
               :ClickData="AllData.ClickData3"
             ></DraBarCharts2Y>
-            <DraLineChartsLeft
-              v-if="AllData.regionGrade == 'four'"
-              :data="AllData.chartData3"
-              :refresh="AllData.refresh3"
-              :ClickData="AllData.ClickData3"
-            />
           </div>
         </div></div
     ></Transition>
@@ -142,12 +126,12 @@
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
             <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
+            <div class="SLList">
               <div class="SlList1P">
                 <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">上游水量</div>
+              <div class="SlList2P">收水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
@@ -156,13 +140,6 @@
               </div>
               <div class="SlList2P">当前站点水量</div>
             </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <span class="SlListNum">{{ AllData.SLFX.downstreamSiteWaterYield }}</span>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">下游水量</div>
-            </div>
           </div>
         </div>
         <div class="modular3_right">
@@ -388,7 +365,6 @@
   ClickData3: "dgtxg",
   GWBD: {},
   SLFX: {},
-  isJBK: true, //是否为接驳口
   chartDataRight: {
     yAxis: [],
     yAxis_Name: "降雨量",
@@ -457,8 +433,8 @@
 
     // 切换时进行数据请求,默认视角请求
     getData1();
+    getData2();
     getData3();
-    getData7();
   }
   if (item.sort == 1) {
     bus.emit("panelDataToMap", {
@@ -513,9 +489,9 @@
     };
 
     // 切换时进行数据请求,默认视角请求
-    getData1();
+    getData2();
+    getData3();
     getData4();
-    getData5();
   }
   if (item.sort == 3) {
     bus.emit("panelDataToMap", {
@@ -530,9 +506,9 @@
       sort: 4,
     };
 
-    getData2();
+    getData3();
+    getData1();
     getData4();
-    getData5();
   }
   if (item.sort == 4) {
     bus.emit("panelDataToMap", {
@@ -571,7 +547,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +556,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +565,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +574,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -628,15 +604,15 @@
         } else if (AllData.regionGrade == "three") {
           // 三级
           console.log("三级");
-          getData1();
+          getData2();
+          getData3();
           getData4();
-          getData5();
         } else if (AllData.regionGrade == "four") {
           // 四级
           console.log("四级");
-          getData2();
+          getData3();
+          getData1();
           getData4();
-          getData5();
         } else {
           // 五级  五级为排水单元,由上可知,因为没有pid 所以此方法无效
           console.log("五级");
@@ -663,14 +639,6 @@
             AllData.GWBD = res.data[0];
           }
         });
-        //   根据type 判断是管井还是接驳口
-        if (Row.properties.type == "rainwater_pipeline_quality_area1") {
-          // 接驳口
-          AllData.isJBK = true;
-        } else {
-          // 管井或其他
-          AllData.isJBK = false;
-        }
         //   上下游水量分析
         getDataSXY(Row.properties);
         //   获取echarts数据
@@ -723,7 +691,7 @@
     sort: 4,
   };
 };
-// 获取数据 徐云欣  一级界面的流域管网/二级界面的管网统计/三级界面的管网统计
+// 获取数据 徐云欣  一级界面的管网统计/二级界面的管网统计/四级界面的管网统计
 const getData1 = () => {
   MonitorAPI.pipelineProblemStatistic({
     regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
@@ -733,7 +701,14 @@
     if (res && res.code == 200) {
       if (AllData.regionGrade == "one") {
         // 一级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
+        AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
@@ -742,288 +717,200 @@
       if (AllData.regionGrade == "two") {
         // 二级Ecahrts 名称
         AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
         AllData.TjData2Unit = "km";
       }
-      if (AllData.regionGrade == "three") {
-        // 三级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
-        AllData.TjData1 = res.data.pipelineLengthList
+      if (AllData.regionGrade == "four") {
+        AllData.chartData3.xAxis = res.data.problemNameList; //X轴数据
+        AllData.chartData3.y1_Unit = "km"; //Y轴单位
+        AllData.chartData3.y2_Unit = ""; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = res.data.pipelineProblemLengthList; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "片区管网问题"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = res.data.pipelineProblemLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(2);
-        AllData.TjData1Unit = "km";
+          .toFixed(0);
+        AllData.TjData3Unit = "km";
+        // // 二级Ecahrts 名称
+        // AllData.chartData2.yAxis_Name = "问题管网";
+        // //   数据赋值
+        // AllData.chartData2.xAxis = res.data.regionNameList;
+        // AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        // AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        // AllData.chartData2.yAxis2_Name = "总长度";
+        // AllData.chartData2.y1_Unit = "km";
+        // AllData.refresh2++;
+        // AllData.TjData2 = res.data.pipelineLengthList
+        //   .reduce((accu, curren) => Number(accu) + Number(curren))
+        //   .toFixed(2);
+        // AllData.TjData2Unit = "km";
       }
-      //   数据赋值
-      AllData.chartData2.xAxis = res.data.regionNameList;
-      AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
-      AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
-      AllData.chartData2.yAxis2_Name = "总长度";
-      AllData.chartData2.y1_Unit = "km";
-      AllData.refresh2++;
     }
   });
 };
-
-// 获取数据 徐云欣  二级界面的管网监测/四级界面的历史风险
+// 获取数据 刘芳阳  一级界面的污水水量(日)/二级界面的污水水量(日)/三级界面的水量统计(日)/四级界面的排水量
 const getData2 = () => {
-  MonitorAPI.pipelineRunRiskStatistic({
-    regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
-    regionName: AllData.regionName, //分区名称
-    regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-    // startTime: "", //开始时间（仅历史风险需要用到）
-    // endTime: "", //结束时间（仅历史风险需要用到）
+  MonitorAPI.sewageWaterRegionWaterYieldAnalysis({
+    sewageWaterRegionId: AllData.waterRegionCode ? AllData.waterRegionCode : 0,
   }).then((res) => {
     if (res && res.code == 200) {
+      let XData = []; //片区名称
+      let data1 = []; //站点数
+      let data2 = []; //进水量
+      let data3 = []; //出水量
+      res.data.forEach((element) => {
+        XData.push(element.waterRegionName);
+        data1.push(element.siteNum);
+        data2.push(element.inWaterYield);
+        data3.push(element.outWaterYield);
+      });
+      if (AllData.regionGrade == "one" || AllData.regionGrade == "three") {
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
       if (AllData.regionGrade == "two") {
-        AllData.chartData1.xAxis = res.data.regionNameList; //X轴数据
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = data3; //数据2
+        AllData.chartData3.yAxis2_bar_Name = "出水量"; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨  一级界面的排水户统计/ 二级界面的排水户统计/ 三级界面的排水户统计
+const getData3 = () => {
+  MonitorAPI.queryDrainageUserInfo({
+    regionId: AllData.waterRegionCode,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      if (
+        AllData.regionGrade == "one" ||
+        AllData.regionGrade == "two" ||
+        AllData.regionGrade == "three"
+      ) {
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = res.data.pipelinePointCount; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageNumber; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "排水户"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = res.data.pipelineRunRiskPointCount; //数据2
-        AllData.chartData1.yAxis2_bar_Name = "运行风险数"; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.keyDrainageNumber; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "重点排水户"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "";
-        AllData.chartData1.yAxis2_line_Index = 0;
+        AllData.chartData1.yAxis2_line = res.data.rtuNumber;
+        AllData.chartData1.yAxis2_line_Name = "监测设备";
+        AllData.chartData1.yAxis2_line_Index = 1;
         AllData.chartData1.yAxis3_line = null;
         AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = res.data.pipelinePointCount
+        AllData.TjData1 = res.data.drainageNumber
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(0);
         AllData.TjData1Unit = "个";
       }
       if (AllData.regionGrade == "four") {
-        // AllData.chartData3.xAxis = res.data.regionNameList;
-        // AllData.chartData3.yAxis = res.data.overFlowRiskTimesList; //溢流风险
-        // AllData.chartData3.yAxis2 = res.data.fullPipeTimesList; //满管风险
-        // AllData.chartData3.yAxis_Name = "溢流风险";
-        // AllData.chartData3.yAxis2_Name = "满管风险";
-        // AllData.refresh3++;
-        AllData.chartData3.xAxis = res.data.regionNameList;
-        AllData.chartData3.yAxis1_bar = null;
-        AllData.chartData3.yAxis1_bar_Name = "";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis2_line = res.data.fullPipeTimesList;
-        AllData.chartData3.yAxis2_line_Name = "满管";
-        AllData.chartData3.yAxis2_line_Index = 0;
-        AllData.chartData3.yAxis3_line = res.data.overFlowRiskTimesList;
-        AllData.chartData3.yAxis3_line_Name = "溢流";
-        AllData.chartData3.yAxis3_line_Index = 0;
-        AllData.chartData3.y1_Unit = "次"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-        AllData.TjData3 = null;
-        AllData.TjData3Unit = null;
-      }
-    }
-  });
-};
-
-// 获取数据 谢杨  一级界面的河湖排口/ 二级界面的河湖排口
-const getData3 = () => {
-  MonitorAPI.outletList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.inflowWater;
-        AllData.chartData3.yAxis1_bar_Name = "进水量";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.outletsNumber;
-        AllData.chartData3.yAxis3_line_Name = "排口";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        AllData.refresh3++;
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "two") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.outletsNumber;
-        AllData.chartData3.yAxis1_bar_Name = "排口";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.inflowWater;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        // nextTick(() => {
-        //   debugger;
-        AllData.refresh3++;
-        // }, 1000);
-
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢杨  三级界面的渍水风险点/ 四级界面的渍水风险点
-const getData4 = () => {
-  //
-  MonitorAPI.pointList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "three") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.pointNumber;
-        AllData.chartData3.yAxis1_bar_Name = "渍水风险点";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "风险排口";
-        AllData.chartData3.yAxis3_line = null;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-
-        AllData.TjData3 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        //
-        AllData.chartData2.xAxis = res.data.partitionName;
-        AllData.chartData2.yAxis = null;
-        AllData.chartData2.yAxis2 = res.data.pointNumber;
-        AllData.chartData2.yAxis2_Name = "数量";
-        AllData.chartData2.yAxis_Name = null;
-        AllData.chartData2.y1_Unit = "个";
-        AllData.refresh2++;
-
-        AllData.TjData2 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢扬 一级界面的河湖水情
-const getData7 = () => {
-  MonitorAPI.queryWaterLevel({}).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        let XData = [];
-        let data1 = []; //当前水位
-        let data2 = []; //设防水位
-        let data3 = []; //调蓄容积
-        res.data.forEach((element) => {
-          XData.push(element.lakeName);
-          data1.push(element.nowWaterlevel);
-          data2.push(element.bestPromitWaterlevel);
-          data3.push(element.volume);
-        });
-        AllData.chartData1.xAxis = XData; //X轴数据
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData1.y2_Unit = "m"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = data3; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageVolume; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "可排水量"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = data2;
-        AllData.chartData1.yAxis2_line_Name = "控制水位";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = data1;
-        AllData.chartData1.yAxis3_line_Name = "当前水位";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-        AllData.TjData1 = null;
-        AllData.TjData1Unit = null;
-      }
-    }
-  });
-};
-// 获取数据 刘芳阳  / 三级 当日水量分析 /四级当日水量分析
-const getData5 = () => {
-  MonitorAPI.waterRegionWaterYieldAnalysis({
-    waterRegionId: AllData.waterRegionCode,
-  }).then((res) => {
-    if (res && res.code == 200) {
-      let XData = [];
-      let YData1 = [];
-      let YData2 = [];
-      let YData3 = [];
-      res.data.forEach((element) => {
-        XData.push(element.waterRegionName); //X轴数据
-        YData1.push(element.siteNum); //点位数量
-        YData2.push(element.inWaterYield); //进水
-        YData3.push(element.outWaterYield); //出水
-      });
-      if (AllData.regionGrade == "three") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = YData2;
-        AllData.chartData1.yAxis2_line_Name = "进水";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-
-        AllData.TjData2 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "接驳点数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.realTimeDrainage; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "实时排水量"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
         AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "进水";
+        AllData.chartData1.yAxis2_line_Name = "";
         AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
+        AllData.chartData1.yAxis3_line = null;
+        AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
+        AllData.TjData1 = res.data.drainageVolume
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData1Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨   三级界面的排水类别/四级界面的排水类别
+const getData4 = () => {
+  MonitorAPI.queryDrainageType({ regionId: AllData.waterRegionCode }).then((res) => {
+    if (res && res.code == 200) {
+      if (AllData.regionGrade == "three" || AllData.regionGrade == "four") {
+        // 三级Ecahrts 名称
+        AllData.chartData2.xAxis = res.data.typeName;
+        AllData.chartData2.yAxis = null;
+        AllData.chartData2.yAxis_Name = "";
+        AllData.chartData2.yAxis2 = res.data.typeNumber;
+        AllData.chartData2.yAxis2_Name = "数量";
+        AllData.chartData2.y1_Unit = "个";
+        AllData.refresh2++;
+        AllData.TjData1 = res.data.typeNumber
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(2);
         AllData.TjData1Unit = "个";
       }
+      //   数据赋值
     }
   });
 };
@@ -1129,8 +1016,8 @@
     if (!newfiberMap) return;
     bus.on("FenQuClick", FenQuClick);
     getData1();
+    getData2();
     getData3();
-    getData7();
     clearInterval(initeGLTimer);
   }, 100);
 });
@@ -1207,6 +1094,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
+        background-repeat: no-repeat;
+        background-size: contain;
 
         .SlList1P {
           width: 100%;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 51becf8..6532818 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -571,7 +571,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +580,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +589,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +598,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -1207,7 +1207,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
-
+        background-repeat: no-repeat;
+        background-size: contain;
         .SlList1P {
           width: 100%;
           height: 40px;

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 9bfb855..ce15c3f 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -17,7 +17,7 @@
 <script setup name="streetscape">
 import { ref, reactive, toRefs, onMounted, nextTick, defineProps, watch } from "vue";
 // import bus from "@/bus";
-// import request from "@/utils/request";
+import request from "@/utils/request";
 import axios from "axios";
 const props = defineProps({
   // 数据id
@@ -50,19 +50,19 @@
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
 
-  let poiData = await axios({
+  let poiData = await request({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
       location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
         AllData.poiCircle[0].toFixed(6)
       )}`,
-      radius: 1000,
+      radius: 100,
       query: "公交站$商场$著名景点$学校",
     },
   });
-  if (poiData && poiData.data.data.length) {
-    AllData.poiData = poiData.data.data;
+  if (poiData && poiData.data.length) {
+    AllData.poiData = poiData.data;
     getStreetImg();
   }
 };
@@ -71,7 +71,7 @@
   AllData.poiImages = [];
   console.log("AllData.poiData---", AllData.poiData);
   AllData.poiData.forEach(async (element) => {
-    let data = await axios({
+    let data = await request({
       url: `/bdApi/baiduservice/panorama`,
       method: "GET",
       params: {
@@ -81,13 +81,15 @@
         width: 512,
       },
     });
-    if (data.data && data.data.data && data.data.data.status == 200) {
-      data.data.data.base64 = "data:image/jpeg;base64," + data.data.data.base64;
+    debugger;
+    if (data && data.data && data.data.status == 200) {
+      data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
       AllData.poiImages.push({
         name: element.name,
         lonlat: [element.location.lng, element.location.lat],
-        imagesUrl: data.data.data.base64,
+        imagesUrl: data.data.base64,
       });
+      selectPoiImgUrl(AllData.poiImages[0]);
     }
   });
   console.log("AllData.poiImages---", AllData.poiImages);
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index d732a0b..e910189 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -150,16 +150,21 @@
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if (filterList.value.length == 0)
       bus.emit('geoRegeo', {
         name: value,
         callback: results => {
-          filterList.value = results.geocodes.map((i, idx) => ({
-            id: idx,
-            name: i.formatted_address,
-            geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-            pointTypeName: '地理位置',
-          }));
+          if(!results.geocodes) return;
+          roadData.value = [
+            {
+              data:results.geocodes.map((i, idx) => ({
+                id: idx,
+                name: i.formatted_address,
+                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+                pointTypeName: '地理位置',
+              }))
+            }
+          ];
+          console.log('roadData.value',roadData.value);
         },
       });
   } else {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 45c2f01..95cce10 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -22,47 +22,42 @@
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖水情"
+                ? "排水户统计"
                 : AllData.regionGrade == "two"
-                ? "管网监测"
+                ? "排水户统计"
                 : AllData.regionGrade == "three"
-                ? "管网统计"
+                ? "排水户统计"
                 : AllData.regionGrade == "four"
-                ? "当日水量分析"
+                ? "水量统计"
                 : ""
             }}
             {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
           </div>
           <div class="modularBody">
-            <DraBarCharts2Y
-              v-if="
+            <!-- v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
-              "
+              " -->
+            <DraBarCharts2Y
               :data="AllData.chartData1"
               :refresh="AllData.refresh1"
               :ClickData="AllData.ClickData1"
             ></DraBarCharts2Y>
-            <DraBarChartsLeft
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData2"
-              :refresh="AllData.refresh2"
-              :ClickData="AllData.ClickData2"
-            ></DraBarChartsLeft>
           </div>
         </div>
         <div class="modular2">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "流域管网"
+                ? "管网统计"
                 : AllData.regionGrade == "two"
                 ? "管网统计"
                 : AllData.regionGrade == "three"
-                ? "当日水量分析"
+                ? "排水类别"
                 : AllData.regionGrade == "four"
-                ? "渍水风险点"
+                ? "排水类别"
                 : ""
             }}
             {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -72,32 +67,26 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
               "
               :data="AllData.chartData2"
               :refresh="AllData.refresh2"
               :ClickData="AllData.ClickData2"
             ></DraBarChartsLeft>
-
-            <DraBarCharts2Y
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData1"
-              :refresh="AllData.refresh1"
-              :ClickData="AllData.ClickData1"
-            ></DraBarCharts2Y>
           </div>
         </div>
         <div class="modular3">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "two"
-                ? "湖泊排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "three"
-                ? "渍水风险点"
+                ? "水量统计(日)"
                 : AllData.regionGrade == "four"
-                ? "历史风险"
+                ? "管网统计"
                 : ""
             }}
             {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -107,18 +96,13 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
-                AllData.regionGrade == 'three'
+                AllData.regionGrade == 'three' ||
+                AllData.regionGrade == 'four'
               "
               :data="AllData.chartData3"
               :refresh="AllData.refresh3"
               :ClickData="AllData.ClickData3"
             ></DraBarCharts2Y>
-            <DraLineChartsLeft
-              v-if="AllData.regionGrade == 'four'"
-              :data="AllData.chartData3"
-              :refresh="AllData.refresh3"
-              :ClickData="AllData.ClickData3"
-            />
           </div>
         </div></div
     ></Transition>
@@ -142,12 +126,12 @@
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
             <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
+            <div class="SLList">
               <div class="SlList1P">
                 <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">上游水量</div>
+              <div class="SlList2P">收水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
@@ -156,13 +140,6 @@
               </div>
               <div class="SlList2P">当前站点水量</div>
             </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <span class="SlListNum">{{ AllData.SLFX.downstreamSiteWaterYield }}</span>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">下游水量</div>
-            </div>
           </div>
         </div>
         <div class="modular3_right">
@@ -388,7 +365,6 @@
   ClickData3: "dgtxg",
   GWBD: {},
   SLFX: {},
-  isJBK: true, //是否为接驳口
   chartDataRight: {
     yAxis: [],
     yAxis_Name: "降雨量",
@@ -457,8 +433,8 @@
 
     // 切换时进行数据请求,默认视角请求
     getData1();
+    getData2();
     getData3();
-    getData7();
   }
   if (item.sort == 1) {
     bus.emit("panelDataToMap", {
@@ -513,9 +489,9 @@
     };
 
     // 切换时进行数据请求,默认视角请求
-    getData1();
+    getData2();
+    getData3();
     getData4();
-    getData5();
   }
   if (item.sort == 3) {
     bus.emit("panelDataToMap", {
@@ -530,9 +506,9 @@
       sort: 4,
     };
 
-    getData2();
+    getData3();
+    getData1();
     getData4();
-    getData5();
   }
   if (item.sort == 4) {
     bus.emit("panelDataToMap", {
@@ -571,7 +547,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +556,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +565,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +574,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -628,15 +604,15 @@
         } else if (AllData.regionGrade == "three") {
           // 三级
           console.log("三级");
-          getData1();
+          getData2();
+          getData3();
           getData4();
-          getData5();
         } else if (AllData.regionGrade == "four") {
           // 四级
           console.log("四级");
-          getData2();
+          getData3();
+          getData1();
           getData4();
-          getData5();
         } else {
           // 五级  五级为排水单元,由上可知,因为没有pid 所以此方法无效
           console.log("五级");
@@ -663,14 +639,6 @@
             AllData.GWBD = res.data[0];
           }
         });
-        //   根据type 判断是管井还是接驳口
-        if (Row.properties.type == "rainwater_pipeline_quality_area1") {
-          // 接驳口
-          AllData.isJBK = true;
-        } else {
-          // 管井或其他
-          AllData.isJBK = false;
-        }
         //   上下游水量分析
         getDataSXY(Row.properties);
         //   获取echarts数据
@@ -723,7 +691,7 @@
     sort: 4,
   };
 };
-// 获取数据 徐云欣  一级界面的流域管网/二级界面的管网统计/三级界面的管网统计
+// 获取数据 徐云欣  一级界面的管网统计/二级界面的管网统计/四级界面的管网统计
 const getData1 = () => {
   MonitorAPI.pipelineProblemStatistic({
     regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
@@ -733,7 +701,14 @@
     if (res && res.code == 200) {
       if (AllData.regionGrade == "one") {
         // 一级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
+        AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
@@ -742,288 +717,200 @@
       if (AllData.regionGrade == "two") {
         // 二级Ecahrts 名称
         AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
         AllData.TjData2Unit = "km";
       }
-      if (AllData.regionGrade == "three") {
-        // 三级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
-        AllData.TjData1 = res.data.pipelineLengthList
+      if (AllData.regionGrade == "four") {
+        AllData.chartData3.xAxis = res.data.problemNameList; //X轴数据
+        AllData.chartData3.y1_Unit = "km"; //Y轴单位
+        AllData.chartData3.y2_Unit = ""; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = res.data.pipelineProblemLengthList; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "片区管网问题"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = res.data.pipelineProblemLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(2);
-        AllData.TjData1Unit = "km";
+          .toFixed(0);
+        AllData.TjData3Unit = "km";
+        // // 二级Ecahrts 名称
+        // AllData.chartData2.yAxis_Name = "问题管网";
+        // //   数据赋值
+        // AllData.chartData2.xAxis = res.data.regionNameList;
+        // AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        // AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        // AllData.chartData2.yAxis2_Name = "总长度";
+        // AllData.chartData2.y1_Unit = "km";
+        // AllData.refresh2++;
+        // AllData.TjData2 = res.data.pipelineLengthList
+        //   .reduce((accu, curren) => Number(accu) + Number(curren))
+        //   .toFixed(2);
+        // AllData.TjData2Unit = "km";
       }
-      //   数据赋值
-      AllData.chartData2.xAxis = res.data.regionNameList;
-      AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
-      AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
-      AllData.chartData2.yAxis2_Name = "总长度";
-      AllData.chartData2.y1_Unit = "km";
-      AllData.refresh2++;
     }
   });
 };
-
-// 获取数据 徐云欣  二级界面的管网监测/四级界面的历史风险
+// 获取数据 刘芳阳  一级界面的污水水量(日)/二级界面的污水水量(日)/三级界面的水量统计(日)/四级界面的排水量
 const getData2 = () => {
-  MonitorAPI.pipelineRunRiskStatistic({
-    regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
-    regionName: AllData.regionName, //分区名称
-    regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-    // startTime: "", //开始时间（仅历史风险需要用到）
-    // endTime: "", //结束时间（仅历史风险需要用到）
+  MonitorAPI.sewageWaterRegionWaterYieldAnalysis({
+    sewageWaterRegionId: AllData.waterRegionCode ? AllData.waterRegionCode : 0,
   }).then((res) => {
     if (res && res.code == 200) {
+      let XData = []; //片区名称
+      let data1 = []; //站点数
+      let data2 = []; //进水量
+      let data3 = []; //出水量
+      res.data.forEach((element) => {
+        XData.push(element.waterRegionName);
+        data1.push(element.siteNum);
+        data2.push(element.inWaterYield);
+        data3.push(element.outWaterYield);
+      });
+      if (AllData.regionGrade == "one" || AllData.regionGrade == "three") {
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
       if (AllData.regionGrade == "two") {
-        AllData.chartData1.xAxis = res.data.regionNameList; //X轴数据
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = data3; //数据2
+        AllData.chartData3.yAxis2_bar_Name = "出水量"; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨  一级界面的排水户统计/ 二级界面的排水户统计/ 三级界面的排水户统计
+const getData3 = () => {
+  MonitorAPI.queryDrainageUserInfo({
+    regionId: AllData.waterRegionCode,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      if (
+        AllData.regionGrade == "one" ||
+        AllData.regionGrade == "two" ||
+        AllData.regionGrade == "three"
+      ) {
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = res.data.pipelinePointCount; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageNumber; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "排水户"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = res.data.pipelineRunRiskPointCount; //数据2
-        AllData.chartData1.yAxis2_bar_Name = "运行风险数"; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.keyDrainageNumber; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "重点排水户"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "";
-        AllData.chartData1.yAxis2_line_Index = 0;
+        AllData.chartData1.yAxis2_line = res.data.rtuNumber;
+        AllData.chartData1.yAxis2_line_Name = "监测设备";
+        AllData.chartData1.yAxis2_line_Index = 1;
         AllData.chartData1.yAxis3_line = null;
         AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = res.data.pipelinePointCount
+        AllData.TjData1 = res.data.drainageNumber
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(0);
         AllData.TjData1Unit = "个";
       }
       if (AllData.regionGrade == "four") {
-        // AllData.chartData3.xAxis = res.data.regionNameList;
-        // AllData.chartData3.yAxis = res.data.overFlowRiskTimesList; //溢流风险
-        // AllData.chartData3.yAxis2 = res.data.fullPipeTimesList; //满管风险
-        // AllData.chartData3.yAxis_Name = "溢流风险";
-        // AllData.chartData3.yAxis2_Name = "满管风险";
-        // AllData.refresh3++;
-        AllData.chartData3.xAxis = res.data.regionNameList;
-        AllData.chartData3.yAxis1_bar = null;
-        AllData.chartData3.yAxis1_bar_Name = "";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis2_line = res.data.fullPipeTimesList;
-        AllData.chartData3.yAxis2_line_Name = "满管";
-        AllData.chartData3.yAxis2_line_Index = 0;
-        AllData.chartData3.yAxis3_line = res.data.overFlowRiskTimesList;
-        AllData.chartData3.yAxis3_line_Name = "溢流";
-        AllData.chartData3.yAxis3_line_Index = 0;
-        AllData.chartData3.y1_Unit = "次"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-        AllData.TjData3 = null;
-        AllData.TjData3Unit = null;
-      }
-    }
-  });
-};
-
-// 获取数据 谢杨  一级界面的河湖排口/ 二级界面的河湖排口
-const getData3 = () => {
-  MonitorAPI.outletList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.inflowWater;
-        AllData.chartData3.yAxis1_bar_Name = "进水量";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.outletsNumber;
-        AllData.chartData3.yAxis3_line_Name = "排口";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        AllData.refresh3++;
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "two") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.outletsNumber;
-        AllData.chartData3.yAxis1_bar_Name = "排口";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.inflowWater;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        // nextTick(() => {
-        //   debugger;
-        AllData.refresh3++;
-        // }, 1000);
-
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢杨  三级界面的渍水风险点/ 四级界面的渍水风险点
-const getData4 = () => {
-  //
-  MonitorAPI.pointList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "three") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.pointNumber;
-        AllData.chartData3.yAxis1_bar_Name = "渍水风险点";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "风险排口";
-        AllData.chartData3.yAxis3_line = null;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-
-        AllData.TjData3 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        //
-        AllData.chartData2.xAxis = res.data.partitionName;
-        AllData.chartData2.yAxis = null;
-        AllData.chartData2.yAxis2 = res.data.pointNumber;
-        AllData.chartData2.yAxis2_Name = "数量";
-        AllData.chartData2.yAxis_Name = null;
-        AllData.chartData2.y1_Unit = "个";
-        AllData.refresh2++;
-
-        AllData.TjData2 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢扬 一级界面的河湖水情
-const getData7 = () => {
-  MonitorAPI.queryWaterLevel({}).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        let XData = [];
-        let data1 = []; //当前水位
-        let data2 = []; //设防水位
-        let data3 = []; //调蓄容积
-        res.data.forEach((element) => {
-          XData.push(element.lakeName);
-          data1.push(element.nowWaterlevel);
-          data2.push(element.bestPromitWaterlevel);
-          data3.push(element.volume);
-        });
-        AllData.chartData1.xAxis = XData; //X轴数据
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData1.y2_Unit = "m"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = data3; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageVolume; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "可排水量"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = data2;
-        AllData.chartData1.yAxis2_line_Name = "控制水位";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = data1;
-        AllData.chartData1.yAxis3_line_Name = "当前水位";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-        AllData.TjData1 = null;
-        AllData.TjData1Unit = null;
-      }
-    }
-  });
-};
-// 获取数据 刘芳阳  / 三级 当日水量分析 /四级当日水量分析
-const getData5 = () => {
-  MonitorAPI.waterRegionWaterYieldAnalysis({
-    waterRegionId: AllData.waterRegionCode,
-  }).then((res) => {
-    if (res && res.code == 200) {
-      let XData = [];
-      let YData1 = [];
-      let YData2 = [];
-      let YData3 = [];
-      res.data.forEach((element) => {
-        XData.push(element.waterRegionName); //X轴数据
-        YData1.push(element.siteNum); //点位数量
-        YData2.push(element.inWaterYield); //进水
-        YData3.push(element.outWaterYield); //出水
-      });
-      if (AllData.regionGrade == "three") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = YData2;
-        AllData.chartData1.yAxis2_line_Name = "进水";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-
-        AllData.TjData2 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "接驳点数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.realTimeDrainage; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "实时排水量"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
         AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "进水";
+        AllData.chartData1.yAxis2_line_Name = "";
         AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
+        AllData.chartData1.yAxis3_line = null;
+        AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
+        AllData.TjData1 = res.data.drainageVolume
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData1Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨   三级界面的排水类别/四级界面的排水类别
+const getData4 = () => {
+  MonitorAPI.queryDrainageType({ regionId: AllData.waterRegionCode }).then((res) => {
+    if (res && res.code == 200) {
+      if (AllData.regionGrade == "three" || AllData.regionGrade == "four") {
+        // 三级Ecahrts 名称
+        AllData.chartData2.xAxis = res.data.typeName;
+        AllData.chartData2.yAxis = null;
+        AllData.chartData2.yAxis_Name = "";
+        AllData.chartData2.yAxis2 = res.data.typeNumber;
+        AllData.chartData2.yAxis2_Name = "数量";
+        AllData.chartData2.y1_Unit = "个";
+        AllData.refresh2++;
+        AllData.TjData1 = res.data.typeNumber
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(2);
         AllData.TjData1Unit = "个";
       }
+      //   数据赋值
     }
   });
 };
@@ -1129,8 +1016,8 @@
     if (!newfiberMap) return;
     bus.on("FenQuClick", FenQuClick);
     getData1();
+    getData2();
     getData3();
-    getData7();
     clearInterval(initeGLTimer);
   }, 100);
 });
@@ -1207,6 +1094,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
+        background-repeat: no-repeat;
+        background-size: contain;
 
         .SlList1P {
           width: 100%;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 51becf8..6532818 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -571,7 +571,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +580,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +589,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +598,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -1207,7 +1207,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
-
+        background-repeat: no-repeat;
+        background-size: contain;
         .SlList1P {
           width: 100%;
           height: 40px;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
index 3611592..1749922 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
@@ -133,6 +133,7 @@
               color: "#AAC1CF",
             },
             splitLine: {
+              show: false,
               lineStyle: {
                 type: "dashed",
                 color: "#2161a8",
@@ -194,12 +195,13 @@
             color: "#AAC1CF",
           },
           splitLine: {
+            show: false,
             lineStyle: {
               type: "dashed",
               color: "#2161a8",
             },
           },
-          alignTicks: true,
+          // alignTicks: true,
           position: "right",
           offset: 0,
         });

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 9bfb855..ce15c3f 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -17,7 +17,7 @@
 <script setup name="streetscape">
 import { ref, reactive, toRefs, onMounted, nextTick, defineProps, watch } from "vue";
 // import bus from "@/bus";
-// import request from "@/utils/request";
+import request from "@/utils/request";
 import axios from "axios";
 const props = defineProps({
   // 数据id
@@ -50,19 +50,19 @@
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
 
-  let poiData = await axios({
+  let poiData = await request({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
       location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
         AllData.poiCircle[0].toFixed(6)
       )}`,
-      radius: 1000,
+      radius: 100,
       query: "公交站$商场$著名景点$学校",
     },
   });
-  if (poiData && poiData.data.data.length) {
-    AllData.poiData = poiData.data.data;
+  if (poiData && poiData.data.length) {
+    AllData.poiData = poiData.data;
     getStreetImg();
   }
 };
@@ -71,7 +71,7 @@
   AllData.poiImages = [];
   console.log("AllData.poiData---", AllData.poiData);
   AllData.poiData.forEach(async (element) => {
-    let data = await axios({
+    let data = await request({
       url: `/bdApi/baiduservice/panorama`,
       method: "GET",
       params: {
@@ -81,13 +81,15 @@
         width: 512,
       },
     });
-    if (data.data && data.data.data && data.data.data.status == 200) {
-      data.data.data.base64 = "data:image/jpeg;base64," + data.data.data.base64;
+    debugger;
+    if (data && data.data && data.data.status == 200) {
+      data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
       AllData.poiImages.push({
         name: element.name,
         lonlat: [element.location.lng, element.location.lat],
-        imagesUrl: data.data.data.base64,
+        imagesUrl: data.data.base64,
       });
+      selectPoiImgUrl(AllData.poiImages[0]);
     }
   });
   console.log("AllData.poiImages---", AllData.poiImages);
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index d732a0b..e910189 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -150,16 +150,21 @@
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if (filterList.value.length == 0)
       bus.emit('geoRegeo', {
         name: value,
         callback: results => {
-          filterList.value = results.geocodes.map((i, idx) => ({
-            id: idx,
-            name: i.formatted_address,
-            geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-            pointTypeName: '地理位置',
-          }));
+          if(!results.geocodes) return;
+          roadData.value = [
+            {
+              data:results.geocodes.map((i, idx) => ({
+                id: idx,
+                name: i.formatted_address,
+                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+                pointTypeName: '地理位置',
+              }))
+            }
+          ];
+          console.log('roadData.value',roadData.value);
         },
       });
   } else {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 45c2f01..95cce10 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -22,47 +22,42 @@
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖水情"
+                ? "排水户统计"
                 : AllData.regionGrade == "two"
-                ? "管网监测"
+                ? "排水户统计"
                 : AllData.regionGrade == "three"
-                ? "管网统计"
+                ? "排水户统计"
                 : AllData.regionGrade == "four"
-                ? "当日水量分析"
+                ? "水量统计"
                 : ""
             }}
             {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
           </div>
           <div class="modularBody">
-            <DraBarCharts2Y
-              v-if="
+            <!-- v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
-              "
+              " -->
+            <DraBarCharts2Y
               :data="AllData.chartData1"
               :refresh="AllData.refresh1"
               :ClickData="AllData.ClickData1"
             ></DraBarCharts2Y>
-            <DraBarChartsLeft
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData2"
-              :refresh="AllData.refresh2"
-              :ClickData="AllData.ClickData2"
-            ></DraBarChartsLeft>
           </div>
         </div>
         <div class="modular2">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "流域管网"
+                ? "管网统计"
                 : AllData.regionGrade == "two"
                 ? "管网统计"
                 : AllData.regionGrade == "three"
-                ? "当日水量分析"
+                ? "排水类别"
                 : AllData.regionGrade == "four"
-                ? "渍水风险点"
+                ? "排水类别"
                 : ""
             }}
             {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -72,32 +67,26 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
               "
               :data="AllData.chartData2"
               :refresh="AllData.refresh2"
               :ClickData="AllData.ClickData2"
             ></DraBarChartsLeft>
-
-            <DraBarCharts2Y
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData1"
-              :refresh="AllData.refresh1"
-              :ClickData="AllData.ClickData1"
-            ></DraBarCharts2Y>
           </div>
         </div>
         <div class="modular3">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "two"
-                ? "湖泊排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "three"
-                ? "渍水风险点"
+                ? "水量统计(日)"
                 : AllData.regionGrade == "four"
-                ? "历史风险"
+                ? "管网统计"
                 : ""
             }}
             {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -107,18 +96,13 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
-                AllData.regionGrade == 'three'
+                AllData.regionGrade == 'three' ||
+                AllData.regionGrade == 'four'
               "
               :data="AllData.chartData3"
               :refresh="AllData.refresh3"
               :ClickData="AllData.ClickData3"
             ></DraBarCharts2Y>
-            <DraLineChartsLeft
-              v-if="AllData.regionGrade == 'four'"
-              :data="AllData.chartData3"
-              :refresh="AllData.refresh3"
-              :ClickData="AllData.ClickData3"
-            />
           </div>
         </div></div
     ></Transition>
@@ -142,12 +126,12 @@
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
             <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
+            <div class="SLList">
               <div class="SlList1P">
                 <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">上游水量</div>
+              <div class="SlList2P">收水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
@@ -156,13 +140,6 @@
               </div>
               <div class="SlList2P">当前站点水量</div>
             </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <span class="SlListNum">{{ AllData.SLFX.downstreamSiteWaterYield }}</span>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">下游水量</div>
-            </div>
           </div>
         </div>
         <div class="modular3_right">
@@ -388,7 +365,6 @@
   ClickData3: "dgtxg",
   GWBD: {},
   SLFX: {},
-  isJBK: true, //是否为接驳口
   chartDataRight: {
     yAxis: [],
     yAxis_Name: "降雨量",
@@ -457,8 +433,8 @@
 
     // 切换时进行数据请求,默认视角请求
     getData1();
+    getData2();
     getData3();
-    getData7();
   }
   if (item.sort == 1) {
     bus.emit("panelDataToMap", {
@@ -513,9 +489,9 @@
     };
 
     // 切换时进行数据请求,默认视角请求
-    getData1();
+    getData2();
+    getData3();
     getData4();
-    getData5();
   }
   if (item.sort == 3) {
     bus.emit("panelDataToMap", {
@@ -530,9 +506,9 @@
       sort: 4,
     };
 
-    getData2();
+    getData3();
+    getData1();
     getData4();
-    getData5();
   }
   if (item.sort == 4) {
     bus.emit("panelDataToMap", {
@@ -571,7 +547,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +556,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +565,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +574,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -628,15 +604,15 @@
         } else if (AllData.regionGrade == "three") {
           // 三级
           console.log("三级");
-          getData1();
+          getData2();
+          getData3();
           getData4();
-          getData5();
         } else if (AllData.regionGrade == "four") {
           // 四级
           console.log("四级");
-          getData2();
+          getData3();
+          getData1();
           getData4();
-          getData5();
         } else {
           // 五级  五级为排水单元,由上可知,因为没有pid 所以此方法无效
           console.log("五级");
@@ -663,14 +639,6 @@
             AllData.GWBD = res.data[0];
           }
         });
-        //   根据type 判断是管井还是接驳口
-        if (Row.properties.type == "rainwater_pipeline_quality_area1") {
-          // 接驳口
-          AllData.isJBK = true;
-        } else {
-          // 管井或其他
-          AllData.isJBK = false;
-        }
         //   上下游水量分析
         getDataSXY(Row.properties);
         //   获取echarts数据
@@ -723,7 +691,7 @@
     sort: 4,
   };
 };
-// 获取数据 徐云欣  一级界面的流域管网/二级界面的管网统计/三级界面的管网统计
+// 获取数据 徐云欣  一级界面的管网统计/二级界面的管网统计/四级界面的管网统计
 const getData1 = () => {
   MonitorAPI.pipelineProblemStatistic({
     regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
@@ -733,7 +701,14 @@
     if (res && res.code == 200) {
       if (AllData.regionGrade == "one") {
         // 一级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
+        AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
@@ -742,288 +717,200 @@
       if (AllData.regionGrade == "two") {
         // 二级Ecahrts 名称
         AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
         AllData.TjData2Unit = "km";
       }
-      if (AllData.regionGrade == "three") {
-        // 三级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
-        AllData.TjData1 = res.data.pipelineLengthList
+      if (AllData.regionGrade == "four") {
+        AllData.chartData3.xAxis = res.data.problemNameList; //X轴数据
+        AllData.chartData3.y1_Unit = "km"; //Y轴单位
+        AllData.chartData3.y2_Unit = ""; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = res.data.pipelineProblemLengthList; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "片区管网问题"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = res.data.pipelineProblemLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(2);
-        AllData.TjData1Unit = "km";
+          .toFixed(0);
+        AllData.TjData3Unit = "km";
+        // // 二级Ecahrts 名称
+        // AllData.chartData2.yAxis_Name = "问题管网";
+        // //   数据赋值
+        // AllData.chartData2.xAxis = res.data.regionNameList;
+        // AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        // AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        // AllData.chartData2.yAxis2_Name = "总长度";
+        // AllData.chartData2.y1_Unit = "km";
+        // AllData.refresh2++;
+        // AllData.TjData2 = res.data.pipelineLengthList
+        //   .reduce((accu, curren) => Number(accu) + Number(curren))
+        //   .toFixed(2);
+        // AllData.TjData2Unit = "km";
       }
-      //   数据赋值
-      AllData.chartData2.xAxis = res.data.regionNameList;
-      AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
-      AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
-      AllData.chartData2.yAxis2_Name = "总长度";
-      AllData.chartData2.y1_Unit = "km";
-      AllData.refresh2++;
     }
   });
 };
-
-// 获取数据 徐云欣  二级界面的管网监测/四级界面的历史风险
+// 获取数据 刘芳阳  一级界面的污水水量(日)/二级界面的污水水量(日)/三级界面的水量统计(日)/四级界面的排水量
 const getData2 = () => {
-  MonitorAPI.pipelineRunRiskStatistic({
-    regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
-    regionName: AllData.regionName, //分区名称
-    regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-    // startTime: "", //开始时间（仅历史风险需要用到）
-    // endTime: "", //结束时间（仅历史风险需要用到）
+  MonitorAPI.sewageWaterRegionWaterYieldAnalysis({
+    sewageWaterRegionId: AllData.waterRegionCode ? AllData.waterRegionCode : 0,
   }).then((res) => {
     if (res && res.code == 200) {
+      let XData = []; //片区名称
+      let data1 = []; //站点数
+      let data2 = []; //进水量
+      let data3 = []; //出水量
+      res.data.forEach((element) => {
+        XData.push(element.waterRegionName);
+        data1.push(element.siteNum);
+        data2.push(element.inWaterYield);
+        data3.push(element.outWaterYield);
+      });
+      if (AllData.regionGrade == "one" || AllData.regionGrade == "three") {
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
       if (AllData.regionGrade == "two") {
-        AllData.chartData1.xAxis = res.data.regionNameList; //X轴数据
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = data3; //数据2
+        AllData.chartData3.yAxis2_bar_Name = "出水量"; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨  一级界面的排水户统计/ 二级界面的排水户统计/ 三级界面的排水户统计
+const getData3 = () => {
+  MonitorAPI.queryDrainageUserInfo({
+    regionId: AllData.waterRegionCode,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      if (
+        AllData.regionGrade == "one" ||
+        AllData.regionGrade == "two" ||
+        AllData.regionGrade == "three"
+      ) {
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = res.data.pipelinePointCount; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageNumber; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "排水户"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = res.data.pipelineRunRiskPointCount; //数据2
-        AllData.chartData1.yAxis2_bar_Name = "运行风险数"; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.keyDrainageNumber; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "重点排水户"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "";
-        AllData.chartData1.yAxis2_line_Index = 0;
+        AllData.chartData1.yAxis2_line = res.data.rtuNumber;
+        AllData.chartData1.yAxis2_line_Name = "监测设备";
+        AllData.chartData1.yAxis2_line_Index = 1;
         AllData.chartData1.yAxis3_line = null;
         AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = res.data.pipelinePointCount
+        AllData.TjData1 = res.data.drainageNumber
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(0);
         AllData.TjData1Unit = "个";
       }
       if (AllData.regionGrade == "four") {
-        // AllData.chartData3.xAxis = res.data.regionNameList;
-        // AllData.chartData3.yAxis = res.data.overFlowRiskTimesList; //溢流风险
-        // AllData.chartData3.yAxis2 = res.data.fullPipeTimesList; //满管风险
-        // AllData.chartData3.yAxis_Name = "溢流风险";
-        // AllData.chartData3.yAxis2_Name = "满管风险";
-        // AllData.refresh3++;
-        AllData.chartData3.xAxis = res.data.regionNameList;
-        AllData.chartData3.yAxis1_bar = null;
-        AllData.chartData3.yAxis1_bar_Name = "";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis2_line = res.data.fullPipeTimesList;
-        AllData.chartData3.yAxis2_line_Name = "满管";
-        AllData.chartData3.yAxis2_line_Index = 0;
-        AllData.chartData3.yAxis3_line = res.data.overFlowRiskTimesList;
-        AllData.chartData3.yAxis3_line_Name = "溢流";
-        AllData.chartData3.yAxis3_line_Index = 0;
-        AllData.chartData3.y1_Unit = "次"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-        AllData.TjData3 = null;
-        AllData.TjData3Unit = null;
-      }
-    }
-  });
-};
-
-// 获取数据 谢杨  一级界面的河湖排口/ 二级界面的河湖排口
-const getData3 = () => {
-  MonitorAPI.outletList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.inflowWater;
-        AllData.chartData3.yAxis1_bar_Name = "进水量";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.outletsNumber;
-        AllData.chartData3.yAxis3_line_Name = "排口";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        AllData.refresh3++;
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "two") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.outletsNumber;
-        AllData.chartData3.yAxis1_bar_Name = "排口";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.inflowWater;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        // nextTick(() => {
-        //   debugger;
-        AllData.refresh3++;
-        // }, 1000);
-
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢杨  三级界面的渍水风险点/ 四级界面的渍水风险点
-const getData4 = () => {
-  //
-  MonitorAPI.pointList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "three") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.pointNumber;
-        AllData.chartData3.yAxis1_bar_Name = "渍水风险点";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "风险排口";
-        AllData.chartData3.yAxis3_line = null;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-
-        AllData.TjData3 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        //
-        AllData.chartData2.xAxis = res.data.partitionName;
-        AllData.chartData2.yAxis = null;
-        AllData.chartData2.yAxis2 = res.data.pointNumber;
-        AllData.chartData2.yAxis2_Name = "数量";
-        AllData.chartData2.yAxis_Name = null;
-        AllData.chartData2.y1_Unit = "个";
-        AllData.refresh2++;
-
-        AllData.TjData2 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢扬 一级界面的河湖水情
-const getData7 = () => {
-  MonitorAPI.queryWaterLevel({}).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        let XData = [];
-        let data1 = []; //当前水位
-        let data2 = []; //设防水位
-        let data3 = []; //调蓄容积
-        res.data.forEach((element) => {
-          XData.push(element.lakeName);
-          data1.push(element.nowWaterlevel);
-          data2.push(element.bestPromitWaterlevel);
-          data3.push(element.volume);
-        });
-        AllData.chartData1.xAxis = XData; //X轴数据
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData1.y2_Unit = "m"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = data3; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageVolume; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "可排水量"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = data2;
-        AllData.chartData1.yAxis2_line_Name = "控制水位";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = data1;
-        AllData.chartData1.yAxis3_line_Name = "当前水位";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-        AllData.TjData1 = null;
-        AllData.TjData1Unit = null;
-      }
-    }
-  });
-};
-// 获取数据 刘芳阳  / 三级 当日水量分析 /四级当日水量分析
-const getData5 = () => {
-  MonitorAPI.waterRegionWaterYieldAnalysis({
-    waterRegionId: AllData.waterRegionCode,
-  }).then((res) => {
-    if (res && res.code == 200) {
-      let XData = [];
-      let YData1 = [];
-      let YData2 = [];
-      let YData3 = [];
-      res.data.forEach((element) => {
-        XData.push(element.waterRegionName); //X轴数据
-        YData1.push(element.siteNum); //点位数量
-        YData2.push(element.inWaterYield); //进水
-        YData3.push(element.outWaterYield); //出水
-      });
-      if (AllData.regionGrade == "three") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = YData2;
-        AllData.chartData1.yAxis2_line_Name = "进水";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-
-        AllData.TjData2 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "接驳点数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.realTimeDrainage; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "实时排水量"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
         AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "进水";
+        AllData.chartData1.yAxis2_line_Name = "";
         AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
+        AllData.chartData1.yAxis3_line = null;
+        AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
+        AllData.TjData1 = res.data.drainageVolume
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData1Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨   三级界面的排水类别/四级界面的排水类别
+const getData4 = () => {
+  MonitorAPI.queryDrainageType({ regionId: AllData.waterRegionCode }).then((res) => {
+    if (res && res.code == 200) {
+      if (AllData.regionGrade == "three" || AllData.regionGrade == "four") {
+        // 三级Ecahrts 名称
+        AllData.chartData2.xAxis = res.data.typeName;
+        AllData.chartData2.yAxis = null;
+        AllData.chartData2.yAxis_Name = "";
+        AllData.chartData2.yAxis2 = res.data.typeNumber;
+        AllData.chartData2.yAxis2_Name = "数量";
+        AllData.chartData2.y1_Unit = "个";
+        AllData.refresh2++;
+        AllData.TjData1 = res.data.typeNumber
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(2);
         AllData.TjData1Unit = "个";
       }
+      //   数据赋值
     }
   });
 };
@@ -1129,8 +1016,8 @@
     if (!newfiberMap) return;
     bus.on("FenQuClick", FenQuClick);
     getData1();
+    getData2();
     getData3();
-    getData7();
     clearInterval(initeGLTimer);
   }, 100);
 });
@@ -1207,6 +1094,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
+        background-repeat: no-repeat;
+        background-size: contain;
 
         .SlList1P {
           width: 100%;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 51becf8..6532818 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -571,7 +571,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +580,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +589,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +598,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -1207,7 +1207,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
-
+        background-repeat: no-repeat;
+        background-size: contain;
         .SlList1P {
           width: 100%;
           height: 40px;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
index 3611592..1749922 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
@@ -133,6 +133,7 @@
               color: "#AAC1CF",
             },
             splitLine: {
+              show: false,
               lineStyle: {
                 type: "dashed",
                 color: "#2161a8",
@@ -194,12 +195,13 @@
             color: "#AAC1CF",
           },
           splitLine: {
+            show: false,
             lineStyle: {
               type: "dashed",
               color: "#2161a8",
             },
           },
-          alignTicks: true,
+          // alignTicks: true,
           position: "right",
           offset: 0,
         });
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
index b12fa14..3b717cc 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
@@ -87,7 +87,7 @@
             align: "right",
             fontSize: 10,
           },
-          max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
+          // max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
           nameLocation: "start",
           type: "value",
           minInterval: 1,
@@ -149,7 +149,7 @@
             // },
             data: props.data.yAxis,
             itemStyle: {
-              borderRadius: [20, 20, 20, 20],
+              borderRadius: [0, 20, 20, 0],
               color: "#FF6464",
             },
             label: {

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 9bfb855..ce15c3f 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -17,7 +17,7 @@
 <script setup name="streetscape">
 import { ref, reactive, toRefs, onMounted, nextTick, defineProps, watch } from "vue";
 // import bus from "@/bus";
-// import request from "@/utils/request";
+import request from "@/utils/request";
 import axios from "axios";
 const props = defineProps({
   // 数据id
@@ -50,19 +50,19 @@
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
 
-  let poiData = await axios({
+  let poiData = await request({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
       location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
         AllData.poiCircle[0].toFixed(6)
       )}`,
-      radius: 1000,
+      radius: 100,
       query: "公交站$商场$著名景点$学校",
     },
   });
-  if (poiData && poiData.data.data.length) {
-    AllData.poiData = poiData.data.data;
+  if (poiData && poiData.data.length) {
+    AllData.poiData = poiData.data;
     getStreetImg();
   }
 };
@@ -71,7 +71,7 @@
   AllData.poiImages = [];
   console.log("AllData.poiData---", AllData.poiData);
   AllData.poiData.forEach(async (element) => {
-    let data = await axios({
+    let data = await request({
       url: `/bdApi/baiduservice/panorama`,
       method: "GET",
       params: {
@@ -81,13 +81,15 @@
         width: 512,
       },
     });
-    if (data.data && data.data.data && data.data.data.status == 200) {
-      data.data.data.base64 = "data:image/jpeg;base64," + data.data.data.base64;
+    debugger;
+    if (data && data.data && data.data.status == 200) {
+      data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
       AllData.poiImages.push({
         name: element.name,
         lonlat: [element.location.lng, element.location.lat],
-        imagesUrl: data.data.data.base64,
+        imagesUrl: data.data.base64,
       });
+      selectPoiImgUrl(AllData.poiImages[0]);
     }
   });
   console.log("AllData.poiImages---", AllData.poiImages);
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index d732a0b..e910189 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -150,16 +150,21 @@
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if (filterList.value.length == 0)
       bus.emit('geoRegeo', {
         name: value,
         callback: results => {
-          filterList.value = results.geocodes.map((i, idx) => ({
-            id: idx,
-            name: i.formatted_address,
-            geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-            pointTypeName: '地理位置',
-          }));
+          if(!results.geocodes) return;
+          roadData.value = [
+            {
+              data:results.geocodes.map((i, idx) => ({
+                id: idx,
+                name: i.formatted_address,
+                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+                pointTypeName: '地理位置',
+              }))
+            }
+          ];
+          console.log('roadData.value',roadData.value);
         },
       });
   } else {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 45c2f01..95cce10 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -22,47 +22,42 @@
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖水情"
+                ? "排水户统计"
                 : AllData.regionGrade == "two"
-                ? "管网监测"
+                ? "排水户统计"
                 : AllData.regionGrade == "three"
-                ? "管网统计"
+                ? "排水户统计"
                 : AllData.regionGrade == "four"
-                ? "当日水量分析"
+                ? "水量统计"
                 : ""
             }}
             {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
           </div>
           <div class="modularBody">
-            <DraBarCharts2Y
-              v-if="
+            <!-- v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
-              "
+              " -->
+            <DraBarCharts2Y
               :data="AllData.chartData1"
               :refresh="AllData.refresh1"
               :ClickData="AllData.ClickData1"
             ></DraBarCharts2Y>
-            <DraBarChartsLeft
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData2"
-              :refresh="AllData.refresh2"
-              :ClickData="AllData.ClickData2"
-            ></DraBarChartsLeft>
           </div>
         </div>
         <div class="modular2">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "流域管网"
+                ? "管网统计"
                 : AllData.regionGrade == "two"
                 ? "管网统计"
                 : AllData.regionGrade == "three"
-                ? "当日水量分析"
+                ? "排水类别"
                 : AllData.regionGrade == "four"
-                ? "渍水风险点"
+                ? "排水类别"
                 : ""
             }}
             {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -72,32 +67,26 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
               "
               :data="AllData.chartData2"
               :refresh="AllData.refresh2"
               :ClickData="AllData.ClickData2"
             ></DraBarChartsLeft>
-
-            <DraBarCharts2Y
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData1"
-              :refresh="AllData.refresh1"
-              :ClickData="AllData.ClickData1"
-            ></DraBarCharts2Y>
           </div>
         </div>
         <div class="modular3">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "two"
-                ? "湖泊排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "three"
-                ? "渍水风险点"
+                ? "水量统计(日)"
                 : AllData.regionGrade == "four"
-                ? "历史风险"
+                ? "管网统计"
                 : ""
             }}
             {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -107,18 +96,13 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
-                AllData.regionGrade == 'three'
+                AllData.regionGrade == 'three' ||
+                AllData.regionGrade == 'four'
               "
               :data="AllData.chartData3"
               :refresh="AllData.refresh3"
               :ClickData="AllData.ClickData3"
             ></DraBarCharts2Y>
-            <DraLineChartsLeft
-              v-if="AllData.regionGrade == 'four'"
-              :data="AllData.chartData3"
-              :refresh="AllData.refresh3"
-              :ClickData="AllData.ClickData3"
-            />
           </div>
         </div></div
     ></Transition>
@@ -142,12 +126,12 @@
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
             <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
+            <div class="SLList">
               <div class="SlList1P">
                 <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">上游水量</div>
+              <div class="SlList2P">收水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
@@ -156,13 +140,6 @@
               </div>
               <div class="SlList2P">当前站点水量</div>
             </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <span class="SlListNum">{{ AllData.SLFX.downstreamSiteWaterYield }}</span>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">下游水量</div>
-            </div>
           </div>
         </div>
         <div class="modular3_right">
@@ -388,7 +365,6 @@
   ClickData3: "dgtxg",
   GWBD: {},
   SLFX: {},
-  isJBK: true, //是否为接驳口
   chartDataRight: {
     yAxis: [],
     yAxis_Name: "降雨量",
@@ -457,8 +433,8 @@
 
     // 切换时进行数据请求,默认视角请求
     getData1();
+    getData2();
     getData3();
-    getData7();
   }
   if (item.sort == 1) {
     bus.emit("panelDataToMap", {
@@ -513,9 +489,9 @@
     };
 
     // 切换时进行数据请求,默认视角请求
-    getData1();
+    getData2();
+    getData3();
     getData4();
-    getData5();
   }
   if (item.sort == 3) {
     bus.emit("panelDataToMap", {
@@ -530,9 +506,9 @@
       sort: 4,
     };
 
-    getData2();
+    getData3();
+    getData1();
     getData4();
-    getData5();
   }
   if (item.sort == 4) {
     bus.emit("panelDataToMap", {
@@ -571,7 +547,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +556,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +565,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +574,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -628,15 +604,15 @@
         } else if (AllData.regionGrade == "three") {
           // 三级
           console.log("三级");
-          getData1();
+          getData2();
+          getData3();
           getData4();
-          getData5();
         } else if (AllData.regionGrade == "four") {
           // 四级
           console.log("四级");
-          getData2();
+          getData3();
+          getData1();
           getData4();
-          getData5();
         } else {
           // 五级  五级为排水单元,由上可知,因为没有pid 所以此方法无效
           console.log("五级");
@@ -663,14 +639,6 @@
             AllData.GWBD = res.data[0];
           }
         });
-        //   根据type 判断是管井还是接驳口
-        if (Row.properties.type == "rainwater_pipeline_quality_area1") {
-          // 接驳口
-          AllData.isJBK = true;
-        } else {
-          // 管井或其他
-          AllData.isJBK = false;
-        }
         //   上下游水量分析
         getDataSXY(Row.properties);
         //   获取echarts数据
@@ -723,7 +691,7 @@
     sort: 4,
   };
 };
-// 获取数据 徐云欣  一级界面的流域管网/二级界面的管网统计/三级界面的管网统计
+// 获取数据 徐云欣  一级界面的管网统计/二级界面的管网统计/四级界面的管网统计
 const getData1 = () => {
   MonitorAPI.pipelineProblemStatistic({
     regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
@@ -733,7 +701,14 @@
     if (res && res.code == 200) {
       if (AllData.regionGrade == "one") {
         // 一级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
+        AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
@@ -742,288 +717,200 @@
       if (AllData.regionGrade == "two") {
         // 二级Ecahrts 名称
         AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
         AllData.TjData2Unit = "km";
       }
-      if (AllData.regionGrade == "three") {
-        // 三级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
-        AllData.TjData1 = res.data.pipelineLengthList
+      if (AllData.regionGrade == "four") {
+        AllData.chartData3.xAxis = res.data.problemNameList; //X轴数据
+        AllData.chartData3.y1_Unit = "km"; //Y轴单位
+        AllData.chartData3.y2_Unit = ""; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = res.data.pipelineProblemLengthList; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "片区管网问题"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = res.data.pipelineProblemLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(2);
-        AllData.TjData1Unit = "km";
+          .toFixed(0);
+        AllData.TjData3Unit = "km";
+        // // 二级Ecahrts 名称
+        // AllData.chartData2.yAxis_Name = "问题管网";
+        // //   数据赋值
+        // AllData.chartData2.xAxis = res.data.regionNameList;
+        // AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        // AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        // AllData.chartData2.yAxis2_Name = "总长度";
+        // AllData.chartData2.y1_Unit = "km";
+        // AllData.refresh2++;
+        // AllData.TjData2 = res.data.pipelineLengthList
+        //   .reduce((accu, curren) => Number(accu) + Number(curren))
+        //   .toFixed(2);
+        // AllData.TjData2Unit = "km";
       }
-      //   数据赋值
-      AllData.chartData2.xAxis = res.data.regionNameList;
-      AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
-      AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
-      AllData.chartData2.yAxis2_Name = "总长度";
-      AllData.chartData2.y1_Unit = "km";
-      AllData.refresh2++;
     }
   });
 };
-
-// 获取数据 徐云欣  二级界面的管网监测/四级界面的历史风险
+// 获取数据 刘芳阳  一级界面的污水水量(日)/二级界面的污水水量(日)/三级界面的水量统计(日)/四级界面的排水量
 const getData2 = () => {
-  MonitorAPI.pipelineRunRiskStatistic({
-    regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
-    regionName: AllData.regionName, //分区名称
-    regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-    // startTime: "", //开始时间（仅历史风险需要用到）
-    // endTime: "", //结束时间（仅历史风险需要用到）
+  MonitorAPI.sewageWaterRegionWaterYieldAnalysis({
+    sewageWaterRegionId: AllData.waterRegionCode ? AllData.waterRegionCode : 0,
   }).then((res) => {
     if (res && res.code == 200) {
+      let XData = []; //片区名称
+      let data1 = []; //站点数
+      let data2 = []; //进水量
+      let data3 = []; //出水量
+      res.data.forEach((element) => {
+        XData.push(element.waterRegionName);
+        data1.push(element.siteNum);
+        data2.push(element.inWaterYield);
+        data3.push(element.outWaterYield);
+      });
+      if (AllData.regionGrade == "one" || AllData.regionGrade == "three") {
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
       if (AllData.regionGrade == "two") {
-        AllData.chartData1.xAxis = res.data.regionNameList; //X轴数据
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = data3; //数据2
+        AllData.chartData3.yAxis2_bar_Name = "出水量"; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨  一级界面的排水户统计/ 二级界面的排水户统计/ 三级界面的排水户统计
+const getData3 = () => {
+  MonitorAPI.queryDrainageUserInfo({
+    regionId: AllData.waterRegionCode,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      if (
+        AllData.regionGrade == "one" ||
+        AllData.regionGrade == "two" ||
+        AllData.regionGrade == "three"
+      ) {
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = res.data.pipelinePointCount; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageNumber; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "排水户"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = res.data.pipelineRunRiskPointCount; //数据2
-        AllData.chartData1.yAxis2_bar_Name = "运行风险数"; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.keyDrainageNumber; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "重点排水户"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "";
-        AllData.chartData1.yAxis2_line_Index = 0;
+        AllData.chartData1.yAxis2_line = res.data.rtuNumber;
+        AllData.chartData1.yAxis2_line_Name = "监测设备";
+        AllData.chartData1.yAxis2_line_Index = 1;
         AllData.chartData1.yAxis3_line = null;
         AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = res.data.pipelinePointCount
+        AllData.TjData1 = res.data.drainageNumber
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(0);
         AllData.TjData1Unit = "个";
       }
       if (AllData.regionGrade == "four") {
-        // AllData.chartData3.xAxis = res.data.regionNameList;
-        // AllData.chartData3.yAxis = res.data.overFlowRiskTimesList; //溢流风险
-        // AllData.chartData3.yAxis2 = res.data.fullPipeTimesList; //满管风险
-        // AllData.chartData3.yAxis_Name = "溢流风险";
-        // AllData.chartData3.yAxis2_Name = "满管风险";
-        // AllData.refresh3++;
-        AllData.chartData3.xAxis = res.data.regionNameList;
-        AllData.chartData3.yAxis1_bar = null;
-        AllData.chartData3.yAxis1_bar_Name = "";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis2_line = res.data.fullPipeTimesList;
-        AllData.chartData3.yAxis2_line_Name = "满管";
-        AllData.chartData3.yAxis2_line_Index = 0;
-        AllData.chartData3.yAxis3_line = res.data.overFlowRiskTimesList;
-        AllData.chartData3.yAxis3_line_Name = "溢流";
-        AllData.chartData3.yAxis3_line_Index = 0;
-        AllData.chartData3.y1_Unit = "次"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-        AllData.TjData3 = null;
-        AllData.TjData3Unit = null;
-      }
-    }
-  });
-};
-
-// 获取数据 谢杨  一级界面的河湖排口/ 二级界面的河湖排口
-const getData3 = () => {
-  MonitorAPI.outletList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.inflowWater;
-        AllData.chartData3.yAxis1_bar_Name = "进水量";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.outletsNumber;
-        AllData.chartData3.yAxis3_line_Name = "排口";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        AllData.refresh3++;
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "two") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.outletsNumber;
-        AllData.chartData3.yAxis1_bar_Name = "排口";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.inflowWater;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        // nextTick(() => {
-        //   debugger;
-        AllData.refresh3++;
-        // }, 1000);
-
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢杨  三级界面的渍水风险点/ 四级界面的渍水风险点
-const getData4 = () => {
-  //
-  MonitorAPI.pointList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "three") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.pointNumber;
-        AllData.chartData3.yAxis1_bar_Name = "渍水风险点";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "风险排口";
-        AllData.chartData3.yAxis3_line = null;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-
-        AllData.TjData3 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        //
-        AllData.chartData2.xAxis = res.data.partitionName;
-        AllData.chartData2.yAxis = null;
-        AllData.chartData2.yAxis2 = res.data.pointNumber;
-        AllData.chartData2.yAxis2_Name = "数量";
-        AllData.chartData2.yAxis_Name = null;
-        AllData.chartData2.y1_Unit = "个";
-        AllData.refresh2++;
-
-        AllData.TjData2 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢扬 一级界面的河湖水情
-const getData7 = () => {
-  MonitorAPI.queryWaterLevel({}).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        let XData = [];
-        let data1 = []; //当前水位
-        let data2 = []; //设防水位
-        let data3 = []; //调蓄容积
-        res.data.forEach((element) => {
-          XData.push(element.lakeName);
-          data1.push(element.nowWaterlevel);
-          data2.push(element.bestPromitWaterlevel);
-          data3.push(element.volume);
-        });
-        AllData.chartData1.xAxis = XData; //X轴数据
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData1.y2_Unit = "m"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = data3; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageVolume; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "可排水量"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = data2;
-        AllData.chartData1.yAxis2_line_Name = "控制水位";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = data1;
-        AllData.chartData1.yAxis3_line_Name = "当前水位";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-        AllData.TjData1 = null;
-        AllData.TjData1Unit = null;
-      }
-    }
-  });
-};
-// 获取数据 刘芳阳  / 三级 当日水量分析 /四级当日水量分析
-const getData5 = () => {
-  MonitorAPI.waterRegionWaterYieldAnalysis({
-    waterRegionId: AllData.waterRegionCode,
-  }).then((res) => {
-    if (res && res.code == 200) {
-      let XData = [];
-      let YData1 = [];
-      let YData2 = [];
-      let YData3 = [];
-      res.data.forEach((element) => {
-        XData.push(element.waterRegionName); //X轴数据
-        YData1.push(element.siteNum); //点位数量
-        YData2.push(element.inWaterYield); //进水
-        YData3.push(element.outWaterYield); //出水
-      });
-      if (AllData.regionGrade == "three") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = YData2;
-        AllData.chartData1.yAxis2_line_Name = "进水";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-
-        AllData.TjData2 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "接驳点数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.realTimeDrainage; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "实时排水量"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
         AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "进水";
+        AllData.chartData1.yAxis2_line_Name = "";
         AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
+        AllData.chartData1.yAxis3_line = null;
+        AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
+        AllData.TjData1 = res.data.drainageVolume
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData1Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨   三级界面的排水类别/四级界面的排水类别
+const getData4 = () => {
+  MonitorAPI.queryDrainageType({ regionId: AllData.waterRegionCode }).then((res) => {
+    if (res && res.code == 200) {
+      if (AllData.regionGrade == "three" || AllData.regionGrade == "four") {
+        // 三级Ecahrts 名称
+        AllData.chartData2.xAxis = res.data.typeName;
+        AllData.chartData2.yAxis = null;
+        AllData.chartData2.yAxis_Name = "";
+        AllData.chartData2.yAxis2 = res.data.typeNumber;
+        AllData.chartData2.yAxis2_Name = "数量";
+        AllData.chartData2.y1_Unit = "个";
+        AllData.refresh2++;
+        AllData.TjData1 = res.data.typeNumber
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(2);
         AllData.TjData1Unit = "个";
       }
+      //   数据赋值
     }
   });
 };
@@ -1129,8 +1016,8 @@
     if (!newfiberMap) return;
     bus.on("FenQuClick", FenQuClick);
     getData1();
+    getData2();
     getData3();
-    getData7();
     clearInterval(initeGLTimer);
   }, 100);
 });
@@ -1207,6 +1094,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
+        background-repeat: no-repeat;
+        background-size: contain;
 
         .SlList1P {
           width: 100%;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 51becf8..6532818 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -571,7 +571,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +580,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +589,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +598,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -1207,7 +1207,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
-
+        background-repeat: no-repeat;
+        background-size: contain;
         .SlList1P {
           width: 100%;
           height: 40px;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
index 3611592..1749922 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
@@ -133,6 +133,7 @@
               color: "#AAC1CF",
             },
             splitLine: {
+              show: false,
               lineStyle: {
                 type: "dashed",
                 color: "#2161a8",
@@ -194,12 +195,13 @@
             color: "#AAC1CF",
           },
           splitLine: {
+            show: false,
             lineStyle: {
               type: "dashed",
               color: "#2161a8",
             },
           },
-          alignTicks: true,
+          // alignTicks: true,
           position: "right",
           offset: 0,
         });
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
index b12fa14..3b717cc 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
@@ -87,7 +87,7 @@
             align: "right",
             fontSize: 10,
           },
-          max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
+          // max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
           nameLocation: "start",
           type: "value",
           minInterval: 1,
@@ -149,7 +149,7 @@
             // },
             data: props.data.yAxis,
             itemStyle: {
-              borderRadius: [20, 20, 20, 20],
+              borderRadius: [0, 20, 20, 0],
               color: "#FF6464",
             },
             label: {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
index 2e07f54..b2b57f4 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
@@ -148,7 +148,7 @@
               },
             },
             nameTextStyle: {
-              color: "#55FFC5",
+              color: "#b14de5",
             },
             splitLine: {
               lineStyle: {
@@ -208,12 +208,12 @@
             symbolSize: 7,
             // 修改折线颜色
             lineStyle: {
-              color: "#55FFC5", // 折线颜色
+              color: "#b14de5", // 折线颜色
               width: 2, // 折线宽度
             },
             // 修改数据点颜色
             itemStyle: {
-              color: "#55FFC5", // 数据点颜色
+              color: "#b14de5", // 数据点颜色
               width: 4,
             },
           },

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 9bfb855..ce15c3f 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -17,7 +17,7 @@
 <script setup name="streetscape">
 import { ref, reactive, toRefs, onMounted, nextTick, defineProps, watch } from "vue";
 // import bus from "@/bus";
-// import request from "@/utils/request";
+import request from "@/utils/request";
 import axios from "axios";
 const props = defineProps({
   // 数据id
@@ -50,19 +50,19 @@
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
 
-  let poiData = await axios({
+  let poiData = await request({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
       location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
         AllData.poiCircle[0].toFixed(6)
       )}`,
-      radius: 1000,
+      radius: 100,
       query: "公交站$商场$著名景点$学校",
     },
   });
-  if (poiData && poiData.data.data.length) {
-    AllData.poiData = poiData.data.data;
+  if (poiData && poiData.data.length) {
+    AllData.poiData = poiData.data;
     getStreetImg();
   }
 };
@@ -71,7 +71,7 @@
   AllData.poiImages = [];
   console.log("AllData.poiData---", AllData.poiData);
   AllData.poiData.forEach(async (element) => {
-    let data = await axios({
+    let data = await request({
       url: `/bdApi/baiduservice/panorama`,
       method: "GET",
       params: {
@@ -81,13 +81,15 @@
         width: 512,
       },
     });
-    if (data.data && data.data.data && data.data.data.status == 200) {
-      data.data.data.base64 = "data:image/jpeg;base64," + data.data.data.base64;
+    debugger;
+    if (data && data.data && data.data.status == 200) {
+      data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
       AllData.poiImages.push({
         name: element.name,
         lonlat: [element.location.lng, element.location.lat],
-        imagesUrl: data.data.data.base64,
+        imagesUrl: data.data.base64,
       });
+      selectPoiImgUrl(AllData.poiImages[0]);
     }
   });
   console.log("AllData.poiImages---", AllData.poiImages);
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index d732a0b..e910189 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -150,16 +150,21 @@
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if (filterList.value.length == 0)
       bus.emit('geoRegeo', {
         name: value,
         callback: results => {
-          filterList.value = results.geocodes.map((i, idx) => ({
-            id: idx,
-            name: i.formatted_address,
-            geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-            pointTypeName: '地理位置',
-          }));
+          if(!results.geocodes) return;
+          roadData.value = [
+            {
+              data:results.geocodes.map((i, idx) => ({
+                id: idx,
+                name: i.formatted_address,
+                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+                pointTypeName: '地理位置',
+              }))
+            }
+          ];
+          console.log('roadData.value',roadData.value);
         },
       });
   } else {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 45c2f01..95cce10 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -22,47 +22,42 @@
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖水情"
+                ? "排水户统计"
                 : AllData.regionGrade == "two"
-                ? "管网监测"
+                ? "排水户统计"
                 : AllData.regionGrade == "three"
-                ? "管网统计"
+                ? "排水户统计"
                 : AllData.regionGrade == "four"
-                ? "当日水量分析"
+                ? "水量统计"
                 : ""
             }}
             {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
           </div>
           <div class="modularBody">
-            <DraBarCharts2Y
-              v-if="
+            <!-- v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
-              "
+              " -->
+            <DraBarCharts2Y
               :data="AllData.chartData1"
               :refresh="AllData.refresh1"
               :ClickData="AllData.ClickData1"
             ></DraBarCharts2Y>
-            <DraBarChartsLeft
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData2"
-              :refresh="AllData.refresh2"
-              :ClickData="AllData.ClickData2"
-            ></DraBarChartsLeft>
           </div>
         </div>
         <div class="modular2">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "流域管网"
+                ? "管网统计"
                 : AllData.regionGrade == "two"
                 ? "管网统计"
                 : AllData.regionGrade == "three"
-                ? "当日水量分析"
+                ? "排水类别"
                 : AllData.regionGrade == "four"
-                ? "渍水风险点"
+                ? "排水类别"
                 : ""
             }}
             {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -72,32 +67,26 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
               "
               :data="AllData.chartData2"
               :refresh="AllData.refresh2"
               :ClickData="AllData.ClickData2"
             ></DraBarChartsLeft>
-
-            <DraBarCharts2Y
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData1"
-              :refresh="AllData.refresh1"
-              :ClickData="AllData.ClickData1"
-            ></DraBarCharts2Y>
           </div>
         </div>
         <div class="modular3">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "two"
-                ? "湖泊排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "three"
-                ? "渍水风险点"
+                ? "水量统计(日)"
                 : AllData.regionGrade == "four"
-                ? "历史风险"
+                ? "管网统计"
                 : ""
             }}
             {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -107,18 +96,13 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
-                AllData.regionGrade == 'three'
+                AllData.regionGrade == 'three' ||
+                AllData.regionGrade == 'four'
               "
               :data="AllData.chartData3"
               :refresh="AllData.refresh3"
               :ClickData="AllData.ClickData3"
             ></DraBarCharts2Y>
-            <DraLineChartsLeft
-              v-if="AllData.regionGrade == 'four'"
-              :data="AllData.chartData3"
-              :refresh="AllData.refresh3"
-              :ClickData="AllData.ClickData3"
-            />
           </div>
         </div></div
     ></Transition>
@@ -142,12 +126,12 @@
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
             <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
+            <div class="SLList">
               <div class="SlList1P">
                 <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">上游水量</div>
+              <div class="SlList2P">收水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
@@ -156,13 +140,6 @@
               </div>
               <div class="SlList2P">当前站点水量</div>
             </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <span class="SlListNum">{{ AllData.SLFX.downstreamSiteWaterYield }}</span>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">下游水量</div>
-            </div>
           </div>
         </div>
         <div class="modular3_right">
@@ -388,7 +365,6 @@
   ClickData3: "dgtxg",
   GWBD: {},
   SLFX: {},
-  isJBK: true, //是否为接驳口
   chartDataRight: {
     yAxis: [],
     yAxis_Name: "降雨量",
@@ -457,8 +433,8 @@
 
     // 切换时进行数据请求,默认视角请求
     getData1();
+    getData2();
     getData3();
-    getData7();
   }
   if (item.sort == 1) {
     bus.emit("panelDataToMap", {
@@ -513,9 +489,9 @@
     };
 
     // 切换时进行数据请求,默认视角请求
-    getData1();
+    getData2();
+    getData3();
     getData4();
-    getData5();
   }
   if (item.sort == 3) {
     bus.emit("panelDataToMap", {
@@ -530,9 +506,9 @@
       sort: 4,
     };
 
-    getData2();
+    getData3();
+    getData1();
     getData4();
-    getData5();
   }
   if (item.sort == 4) {
     bus.emit("panelDataToMap", {
@@ -571,7 +547,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +556,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +565,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +574,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -628,15 +604,15 @@
         } else if (AllData.regionGrade == "three") {
           // 三级
           console.log("三级");
-          getData1();
+          getData2();
+          getData3();
           getData4();
-          getData5();
         } else if (AllData.regionGrade == "four") {
           // 四级
           console.log("四级");
-          getData2();
+          getData3();
+          getData1();
           getData4();
-          getData5();
         } else {
           // 五级  五级为排水单元,由上可知,因为没有pid 所以此方法无效
           console.log("五级");
@@ -663,14 +639,6 @@
             AllData.GWBD = res.data[0];
           }
         });
-        //   根据type 判断是管井还是接驳口
-        if (Row.properties.type == "rainwater_pipeline_quality_area1") {
-          // 接驳口
-          AllData.isJBK = true;
-        } else {
-          // 管井或其他
-          AllData.isJBK = false;
-        }
         //   上下游水量分析
         getDataSXY(Row.properties);
         //   获取echarts数据
@@ -723,7 +691,7 @@
     sort: 4,
   };
 };
-// 获取数据 徐云欣  一级界面的流域管网/二级界面的管网统计/三级界面的管网统计
+// 获取数据 徐云欣  一级界面的管网统计/二级界面的管网统计/四级界面的管网统计
 const getData1 = () => {
   MonitorAPI.pipelineProblemStatistic({
     regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
@@ -733,7 +701,14 @@
     if (res && res.code == 200) {
       if (AllData.regionGrade == "one") {
         // 一级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
+        AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
@@ -742,288 +717,200 @@
       if (AllData.regionGrade == "two") {
         // 二级Ecahrts 名称
         AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
         AllData.TjData2Unit = "km";
       }
-      if (AllData.regionGrade == "three") {
-        // 三级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
-        AllData.TjData1 = res.data.pipelineLengthList
+      if (AllData.regionGrade == "four") {
+        AllData.chartData3.xAxis = res.data.problemNameList; //X轴数据
+        AllData.chartData3.y1_Unit = "km"; //Y轴单位
+        AllData.chartData3.y2_Unit = ""; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = res.data.pipelineProblemLengthList; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "片区管网问题"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = res.data.pipelineProblemLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(2);
-        AllData.TjData1Unit = "km";
+          .toFixed(0);
+        AllData.TjData3Unit = "km";
+        // // 二级Ecahrts 名称
+        // AllData.chartData2.yAxis_Name = "问题管网";
+        // //   数据赋值
+        // AllData.chartData2.xAxis = res.data.regionNameList;
+        // AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        // AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        // AllData.chartData2.yAxis2_Name = "总长度";
+        // AllData.chartData2.y1_Unit = "km";
+        // AllData.refresh2++;
+        // AllData.TjData2 = res.data.pipelineLengthList
+        //   .reduce((accu, curren) => Number(accu) + Number(curren))
+        //   .toFixed(2);
+        // AllData.TjData2Unit = "km";
       }
-      //   数据赋值
-      AllData.chartData2.xAxis = res.data.regionNameList;
-      AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
-      AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
-      AllData.chartData2.yAxis2_Name = "总长度";
-      AllData.chartData2.y1_Unit = "km";
-      AllData.refresh2++;
     }
   });
 };
-
-// 获取数据 徐云欣  二级界面的管网监测/四级界面的历史风险
+// 获取数据 刘芳阳  一级界面的污水水量(日)/二级界面的污水水量(日)/三级界面的水量统计(日)/四级界面的排水量
 const getData2 = () => {
-  MonitorAPI.pipelineRunRiskStatistic({
-    regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
-    regionName: AllData.regionName, //分区名称
-    regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-    // startTime: "", //开始时间（仅历史风险需要用到）
-    // endTime: "", //结束时间（仅历史风险需要用到）
+  MonitorAPI.sewageWaterRegionWaterYieldAnalysis({
+    sewageWaterRegionId: AllData.waterRegionCode ? AllData.waterRegionCode : 0,
   }).then((res) => {
     if (res && res.code == 200) {
+      let XData = []; //片区名称
+      let data1 = []; //站点数
+      let data2 = []; //进水量
+      let data3 = []; //出水量
+      res.data.forEach((element) => {
+        XData.push(element.waterRegionName);
+        data1.push(element.siteNum);
+        data2.push(element.inWaterYield);
+        data3.push(element.outWaterYield);
+      });
+      if (AllData.regionGrade == "one" || AllData.regionGrade == "three") {
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
       if (AllData.regionGrade == "two") {
-        AllData.chartData1.xAxis = res.data.regionNameList; //X轴数据
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = data3; //数据2
+        AllData.chartData3.yAxis2_bar_Name = "出水量"; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨  一级界面的排水户统计/ 二级界面的排水户统计/ 三级界面的排水户统计
+const getData3 = () => {
+  MonitorAPI.queryDrainageUserInfo({
+    regionId: AllData.waterRegionCode,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      if (
+        AllData.regionGrade == "one" ||
+        AllData.regionGrade == "two" ||
+        AllData.regionGrade == "three"
+      ) {
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = res.data.pipelinePointCount; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageNumber; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "排水户"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = res.data.pipelineRunRiskPointCount; //数据2
-        AllData.chartData1.yAxis2_bar_Name = "运行风险数"; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.keyDrainageNumber; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "重点排水户"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "";
-        AllData.chartData1.yAxis2_line_Index = 0;
+        AllData.chartData1.yAxis2_line = res.data.rtuNumber;
+        AllData.chartData1.yAxis2_line_Name = "监测设备";
+        AllData.chartData1.yAxis2_line_Index = 1;
         AllData.chartData1.yAxis3_line = null;
         AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = res.data.pipelinePointCount
+        AllData.TjData1 = res.data.drainageNumber
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(0);
         AllData.TjData1Unit = "个";
       }
       if (AllData.regionGrade == "four") {
-        // AllData.chartData3.xAxis = res.data.regionNameList;
-        // AllData.chartData3.yAxis = res.data.overFlowRiskTimesList; //溢流风险
-        // AllData.chartData3.yAxis2 = res.data.fullPipeTimesList; //满管风险
-        // AllData.chartData3.yAxis_Name = "溢流风险";
-        // AllData.chartData3.yAxis2_Name = "满管风险";
-        // AllData.refresh3++;
-        AllData.chartData3.xAxis = res.data.regionNameList;
-        AllData.chartData3.yAxis1_bar = null;
-        AllData.chartData3.yAxis1_bar_Name = "";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis2_line = res.data.fullPipeTimesList;
-        AllData.chartData3.yAxis2_line_Name = "满管";
-        AllData.chartData3.yAxis2_line_Index = 0;
-        AllData.chartData3.yAxis3_line = res.data.overFlowRiskTimesList;
-        AllData.chartData3.yAxis3_line_Name = "溢流";
-        AllData.chartData3.yAxis3_line_Index = 0;
-        AllData.chartData3.y1_Unit = "次"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-        AllData.TjData3 = null;
-        AllData.TjData3Unit = null;
-      }
-    }
-  });
-};
-
-// 获取数据 谢杨  一级界面的河湖排口/ 二级界面的河湖排口
-const getData3 = () => {
-  MonitorAPI.outletList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.inflowWater;
-        AllData.chartData3.yAxis1_bar_Name = "进水量";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.outletsNumber;
-        AllData.chartData3.yAxis3_line_Name = "排口";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        AllData.refresh3++;
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "two") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.outletsNumber;
-        AllData.chartData3.yAxis1_bar_Name = "排口";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.inflowWater;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        // nextTick(() => {
-        //   debugger;
-        AllData.refresh3++;
-        // }, 1000);
-
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢杨  三级界面的渍水风险点/ 四级界面的渍水风险点
-const getData4 = () => {
-  //
-  MonitorAPI.pointList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "three") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.pointNumber;
-        AllData.chartData3.yAxis1_bar_Name = "渍水风险点";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "风险排口";
-        AllData.chartData3.yAxis3_line = null;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-
-        AllData.TjData3 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        //
-        AllData.chartData2.xAxis = res.data.partitionName;
-        AllData.chartData2.yAxis = null;
-        AllData.chartData2.yAxis2 = res.data.pointNumber;
-        AllData.chartData2.yAxis2_Name = "数量";
-        AllData.chartData2.yAxis_Name = null;
-        AllData.chartData2.y1_Unit = "个";
-        AllData.refresh2++;
-
-        AllData.TjData2 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢扬 一级界面的河湖水情
-const getData7 = () => {
-  MonitorAPI.queryWaterLevel({}).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        let XData = [];
-        let data1 = []; //当前水位
-        let data2 = []; //设防水位
-        let data3 = []; //调蓄容积
-        res.data.forEach((element) => {
-          XData.push(element.lakeName);
-          data1.push(element.nowWaterlevel);
-          data2.push(element.bestPromitWaterlevel);
-          data3.push(element.volume);
-        });
-        AllData.chartData1.xAxis = XData; //X轴数据
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData1.y2_Unit = "m"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = data3; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageVolume; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "可排水量"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = data2;
-        AllData.chartData1.yAxis2_line_Name = "控制水位";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = data1;
-        AllData.chartData1.yAxis3_line_Name = "当前水位";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-        AllData.TjData1 = null;
-        AllData.TjData1Unit = null;
-      }
-    }
-  });
-};
-// 获取数据 刘芳阳  / 三级 当日水量分析 /四级当日水量分析
-const getData5 = () => {
-  MonitorAPI.waterRegionWaterYieldAnalysis({
-    waterRegionId: AllData.waterRegionCode,
-  }).then((res) => {
-    if (res && res.code == 200) {
-      let XData = [];
-      let YData1 = [];
-      let YData2 = [];
-      let YData3 = [];
-      res.data.forEach((element) => {
-        XData.push(element.waterRegionName); //X轴数据
-        YData1.push(element.siteNum); //点位数量
-        YData2.push(element.inWaterYield); //进水
-        YData3.push(element.outWaterYield); //出水
-      });
-      if (AllData.regionGrade == "three") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = YData2;
-        AllData.chartData1.yAxis2_line_Name = "进水";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-
-        AllData.TjData2 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "接驳点数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.realTimeDrainage; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "实时排水量"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
         AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "进水";
+        AllData.chartData1.yAxis2_line_Name = "";
         AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
+        AllData.chartData1.yAxis3_line = null;
+        AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
+        AllData.TjData1 = res.data.drainageVolume
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData1Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨   三级界面的排水类别/四级界面的排水类别
+const getData4 = () => {
+  MonitorAPI.queryDrainageType({ regionId: AllData.waterRegionCode }).then((res) => {
+    if (res && res.code == 200) {
+      if (AllData.regionGrade == "three" || AllData.regionGrade == "four") {
+        // 三级Ecahrts 名称
+        AllData.chartData2.xAxis = res.data.typeName;
+        AllData.chartData2.yAxis = null;
+        AllData.chartData2.yAxis_Name = "";
+        AllData.chartData2.yAxis2 = res.data.typeNumber;
+        AllData.chartData2.yAxis2_Name = "数量";
+        AllData.chartData2.y1_Unit = "个";
+        AllData.refresh2++;
+        AllData.TjData1 = res.data.typeNumber
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(2);
         AllData.TjData1Unit = "个";
       }
+      //   数据赋值
     }
   });
 };
@@ -1129,8 +1016,8 @@
     if (!newfiberMap) return;
     bus.on("FenQuClick", FenQuClick);
     getData1();
+    getData2();
     getData3();
-    getData7();
     clearInterval(initeGLTimer);
   }, 100);
 });
@@ -1207,6 +1094,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
+        background-repeat: no-repeat;
+        background-size: contain;
 
         .SlList1P {
           width: 100%;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 51becf8..6532818 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -571,7 +571,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +580,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +589,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +598,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -1207,7 +1207,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
-
+        background-repeat: no-repeat;
+        background-size: contain;
         .SlList1P {
           width: 100%;
           height: 40px;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
index 3611592..1749922 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
@@ -133,6 +133,7 @@
               color: "#AAC1CF",
             },
             splitLine: {
+              show: false,
               lineStyle: {
                 type: "dashed",
                 color: "#2161a8",
@@ -194,12 +195,13 @@
             color: "#AAC1CF",
           },
           splitLine: {
+            show: false,
             lineStyle: {
               type: "dashed",
               color: "#2161a8",
             },
           },
-          alignTicks: true,
+          // alignTicks: true,
           position: "right",
           offset: 0,
         });
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
index b12fa14..3b717cc 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
@@ -87,7 +87,7 @@
             align: "right",
             fontSize: 10,
           },
-          max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
+          // max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
           nameLocation: "start",
           type: "value",
           minInterval: 1,
@@ -149,7 +149,7 @@
             // },
             data: props.data.yAxis,
             itemStyle: {
-              borderRadius: [20, 20, 20, 20],
+              borderRadius: [0, 20, 20, 0],
               color: "#FF6464",
             },
             label: {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
index 2e07f54..b2b57f4 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
@@ -148,7 +148,7 @@
               },
             },
             nameTextStyle: {
-              color: "#55FFC5",
+              color: "#b14de5",
             },
             splitLine: {
               lineStyle: {
@@ -208,12 +208,12 @@
             symbolSize: 7,
             // 修改折线颜色
             lineStyle: {
-              color: "#55FFC5", // 折线颜色
+              color: "#b14de5", // 折线颜色
               width: 2, // 折线宽度
             },
             // 修改数据点颜色
             itemStyle: {
-              color: "#55FFC5", // 数据点颜色
+              color: "#b14de5", // 数据点颜色
               width: 4,
             },
           },
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
index 0d94a78..aafc8e7 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
@@ -63,6 +63,7 @@
         </div>
       </div>
       
+      
         
     </div>
     <div class="nodata" v-else>
@@ -182,8 +183,19 @@
 <style lang="scss" scoped>
 .MonitoringAlarm {
   height: 100%;
+  :deep(.el-carousel){
+   height: calc(100% - 35px);
+   .el-carousel__container {
+   height: 100%;
+
+   }
+  .el-carousel__indicators {
+    display: none;
+  }
+  }
   .heatingPower {
-   height: calc(100% - 65px);
+  //  height: calc/(100% - 65px);
+   height: 100%;
     overflow-y: auto;
     padding: 30px 15px;
     position: relative;

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 9bfb855..ce15c3f 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -17,7 +17,7 @@
 <script setup name="streetscape">
 import { ref, reactive, toRefs, onMounted, nextTick, defineProps, watch } from "vue";
 // import bus from "@/bus";
-// import request from "@/utils/request";
+import request from "@/utils/request";
 import axios from "axios";
 const props = defineProps({
   // 数据id
@@ -50,19 +50,19 @@
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
 
-  let poiData = await axios({
+  let poiData = await request({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
       location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
         AllData.poiCircle[0].toFixed(6)
       )}`,
-      radius: 1000,
+      radius: 100,
       query: "公交站$商场$著名景点$学校",
     },
   });
-  if (poiData && poiData.data.data.length) {
-    AllData.poiData = poiData.data.data;
+  if (poiData && poiData.data.length) {
+    AllData.poiData = poiData.data;
     getStreetImg();
   }
 };
@@ -71,7 +71,7 @@
   AllData.poiImages = [];
   console.log("AllData.poiData---", AllData.poiData);
   AllData.poiData.forEach(async (element) => {
-    let data = await axios({
+    let data = await request({
       url: `/bdApi/baiduservice/panorama`,
       method: "GET",
       params: {
@@ -81,13 +81,15 @@
         width: 512,
       },
     });
-    if (data.data && data.data.data && data.data.data.status == 200) {
-      data.data.data.base64 = "data:image/jpeg;base64," + data.data.data.base64;
+    debugger;
+    if (data && data.data && data.data.status == 200) {
+      data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
       AllData.poiImages.push({
         name: element.name,
         lonlat: [element.location.lng, element.location.lat],
-        imagesUrl: data.data.data.base64,
+        imagesUrl: data.data.base64,
       });
+      selectPoiImgUrl(AllData.poiImages[0]);
     }
   });
   console.log("AllData.poiImages---", AllData.poiImages);
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index d732a0b..e910189 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -150,16 +150,21 @@
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if (filterList.value.length == 0)
       bus.emit('geoRegeo', {
         name: value,
         callback: results => {
-          filterList.value = results.geocodes.map((i, idx) => ({
-            id: idx,
-            name: i.formatted_address,
-            geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-            pointTypeName: '地理位置',
-          }));
+          if(!results.geocodes) return;
+          roadData.value = [
+            {
+              data:results.geocodes.map((i, idx) => ({
+                id: idx,
+                name: i.formatted_address,
+                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+                pointTypeName: '地理位置',
+              }))
+            }
+          ];
+          console.log('roadData.value',roadData.value);
         },
       });
   } else {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 45c2f01..95cce10 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -22,47 +22,42 @@
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖水情"
+                ? "排水户统计"
                 : AllData.regionGrade == "two"
-                ? "管网监测"
+                ? "排水户统计"
                 : AllData.regionGrade == "three"
-                ? "管网统计"
+                ? "排水户统计"
                 : AllData.regionGrade == "four"
-                ? "当日水量分析"
+                ? "水量统计"
                 : ""
             }}
             {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
           </div>
           <div class="modularBody">
-            <DraBarCharts2Y
-              v-if="
+            <!-- v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
-              "
+              " -->
+            <DraBarCharts2Y
               :data="AllData.chartData1"
               :refresh="AllData.refresh1"
               :ClickData="AllData.ClickData1"
             ></DraBarCharts2Y>
-            <DraBarChartsLeft
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData2"
-              :refresh="AllData.refresh2"
-              :ClickData="AllData.ClickData2"
-            ></DraBarChartsLeft>
           </div>
         </div>
         <div class="modular2">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "流域管网"
+                ? "管网统计"
                 : AllData.regionGrade == "two"
                 ? "管网统计"
                 : AllData.regionGrade == "three"
-                ? "当日水量分析"
+                ? "排水类别"
                 : AllData.regionGrade == "four"
-                ? "渍水风险点"
+                ? "排水类别"
                 : ""
             }}
             {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -72,32 +67,26 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
               "
               :data="AllData.chartData2"
               :refresh="AllData.refresh2"
               :ClickData="AllData.ClickData2"
             ></DraBarChartsLeft>
-
-            <DraBarCharts2Y
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData1"
-              :refresh="AllData.refresh1"
-              :ClickData="AllData.ClickData1"
-            ></DraBarCharts2Y>
           </div>
         </div>
         <div class="modular3">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "two"
-                ? "湖泊排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "three"
-                ? "渍水风险点"
+                ? "水量统计(日)"
                 : AllData.regionGrade == "four"
-                ? "历史风险"
+                ? "管网统计"
                 : ""
             }}
             {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -107,18 +96,13 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
-                AllData.regionGrade == 'three'
+                AllData.regionGrade == 'three' ||
+                AllData.regionGrade == 'four'
               "
               :data="AllData.chartData3"
               :refresh="AllData.refresh3"
               :ClickData="AllData.ClickData3"
             ></DraBarCharts2Y>
-            <DraLineChartsLeft
-              v-if="AllData.regionGrade == 'four'"
-              :data="AllData.chartData3"
-              :refresh="AllData.refresh3"
-              :ClickData="AllData.ClickData3"
-            />
           </div>
         </div></div
     ></Transition>
@@ -142,12 +126,12 @@
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
             <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
+            <div class="SLList">
               <div class="SlList1P">
                 <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">上游水量</div>
+              <div class="SlList2P">收水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
@@ -156,13 +140,6 @@
               </div>
               <div class="SlList2P">当前站点水量</div>
             </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <span class="SlListNum">{{ AllData.SLFX.downstreamSiteWaterYield }}</span>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">下游水量</div>
-            </div>
           </div>
         </div>
         <div class="modular3_right">
@@ -388,7 +365,6 @@
   ClickData3: "dgtxg",
   GWBD: {},
   SLFX: {},
-  isJBK: true, //是否为接驳口
   chartDataRight: {
     yAxis: [],
     yAxis_Name: "降雨量",
@@ -457,8 +433,8 @@
 
     // 切换时进行数据请求,默认视角请求
     getData1();
+    getData2();
     getData3();
-    getData7();
   }
   if (item.sort == 1) {
     bus.emit("panelDataToMap", {
@@ -513,9 +489,9 @@
     };
 
     // 切换时进行数据请求,默认视角请求
-    getData1();
+    getData2();
+    getData3();
     getData4();
-    getData5();
   }
   if (item.sort == 3) {
     bus.emit("panelDataToMap", {
@@ -530,9 +506,9 @@
       sort: 4,
     };
 
-    getData2();
+    getData3();
+    getData1();
     getData4();
-    getData5();
   }
   if (item.sort == 4) {
     bus.emit("panelDataToMap", {
@@ -571,7 +547,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +556,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +565,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +574,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -628,15 +604,15 @@
         } else if (AllData.regionGrade == "three") {
           // 三级
           console.log("三级");
-          getData1();
+          getData2();
+          getData3();
           getData4();
-          getData5();
         } else if (AllData.regionGrade == "four") {
           // 四级
           console.log("四级");
-          getData2();
+          getData3();
+          getData1();
           getData4();
-          getData5();
         } else {
           // 五级  五级为排水单元,由上可知,因为没有pid 所以此方法无效
           console.log("五级");
@@ -663,14 +639,6 @@
             AllData.GWBD = res.data[0];
           }
         });
-        //   根据type 判断是管井还是接驳口
-        if (Row.properties.type == "rainwater_pipeline_quality_area1") {
-          // 接驳口
-          AllData.isJBK = true;
-        } else {
-          // 管井或其他
-          AllData.isJBK = false;
-        }
         //   上下游水量分析
         getDataSXY(Row.properties);
         //   获取echarts数据
@@ -723,7 +691,7 @@
     sort: 4,
   };
 };
-// 获取数据 徐云欣  一级界面的流域管网/二级界面的管网统计/三级界面的管网统计
+// 获取数据 徐云欣  一级界面的管网统计/二级界面的管网统计/四级界面的管网统计
 const getData1 = () => {
   MonitorAPI.pipelineProblemStatistic({
     regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
@@ -733,7 +701,14 @@
     if (res && res.code == 200) {
       if (AllData.regionGrade == "one") {
         // 一级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
+        AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
@@ -742,288 +717,200 @@
       if (AllData.regionGrade == "two") {
         // 二级Ecahrts 名称
         AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
         AllData.TjData2Unit = "km";
       }
-      if (AllData.regionGrade == "three") {
-        // 三级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
-        AllData.TjData1 = res.data.pipelineLengthList
+      if (AllData.regionGrade == "four") {
+        AllData.chartData3.xAxis = res.data.problemNameList; //X轴数据
+        AllData.chartData3.y1_Unit = "km"; //Y轴单位
+        AllData.chartData3.y2_Unit = ""; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = res.data.pipelineProblemLengthList; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "片区管网问题"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = res.data.pipelineProblemLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(2);
-        AllData.TjData1Unit = "km";
+          .toFixed(0);
+        AllData.TjData3Unit = "km";
+        // // 二级Ecahrts 名称
+        // AllData.chartData2.yAxis_Name = "问题管网";
+        // //   数据赋值
+        // AllData.chartData2.xAxis = res.data.regionNameList;
+        // AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        // AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        // AllData.chartData2.yAxis2_Name = "总长度";
+        // AllData.chartData2.y1_Unit = "km";
+        // AllData.refresh2++;
+        // AllData.TjData2 = res.data.pipelineLengthList
+        //   .reduce((accu, curren) => Number(accu) + Number(curren))
+        //   .toFixed(2);
+        // AllData.TjData2Unit = "km";
       }
-      //   数据赋值
-      AllData.chartData2.xAxis = res.data.regionNameList;
-      AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
-      AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
-      AllData.chartData2.yAxis2_Name = "总长度";
-      AllData.chartData2.y1_Unit = "km";
-      AllData.refresh2++;
     }
   });
 };
-
-// 获取数据 徐云欣  二级界面的管网监测/四级界面的历史风险
+// 获取数据 刘芳阳  一级界面的污水水量(日)/二级界面的污水水量(日)/三级界面的水量统计(日)/四级界面的排水量
 const getData2 = () => {
-  MonitorAPI.pipelineRunRiskStatistic({
-    regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
-    regionName: AllData.regionName, //分区名称
-    regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-    // startTime: "", //开始时间（仅历史风险需要用到）
-    // endTime: "", //结束时间（仅历史风险需要用到）
+  MonitorAPI.sewageWaterRegionWaterYieldAnalysis({
+    sewageWaterRegionId: AllData.waterRegionCode ? AllData.waterRegionCode : 0,
   }).then((res) => {
     if (res && res.code == 200) {
+      let XData = []; //片区名称
+      let data1 = []; //站点数
+      let data2 = []; //进水量
+      let data3 = []; //出水量
+      res.data.forEach((element) => {
+        XData.push(element.waterRegionName);
+        data1.push(element.siteNum);
+        data2.push(element.inWaterYield);
+        data3.push(element.outWaterYield);
+      });
+      if (AllData.regionGrade == "one" || AllData.regionGrade == "three") {
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
       if (AllData.regionGrade == "two") {
-        AllData.chartData1.xAxis = res.data.regionNameList; //X轴数据
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = data3; //数据2
+        AllData.chartData3.yAxis2_bar_Name = "出水量"; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨  一级界面的排水户统计/ 二级界面的排水户统计/ 三级界面的排水户统计
+const getData3 = () => {
+  MonitorAPI.queryDrainageUserInfo({
+    regionId: AllData.waterRegionCode,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      if (
+        AllData.regionGrade == "one" ||
+        AllData.regionGrade == "two" ||
+        AllData.regionGrade == "three"
+      ) {
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = res.data.pipelinePointCount; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageNumber; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "排水户"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = res.data.pipelineRunRiskPointCount; //数据2
-        AllData.chartData1.yAxis2_bar_Name = "运行风险数"; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.keyDrainageNumber; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "重点排水户"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "";
-        AllData.chartData1.yAxis2_line_Index = 0;
+        AllData.chartData1.yAxis2_line = res.data.rtuNumber;
+        AllData.chartData1.yAxis2_line_Name = "监测设备";
+        AllData.chartData1.yAxis2_line_Index = 1;
         AllData.chartData1.yAxis3_line = null;
         AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = res.data.pipelinePointCount
+        AllData.TjData1 = res.data.drainageNumber
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(0);
         AllData.TjData1Unit = "个";
       }
       if (AllData.regionGrade == "four") {
-        // AllData.chartData3.xAxis = res.data.regionNameList;
-        // AllData.chartData3.yAxis = res.data.overFlowRiskTimesList; //溢流风险
-        // AllData.chartData3.yAxis2 = res.data.fullPipeTimesList; //满管风险
-        // AllData.chartData3.yAxis_Name = "溢流风险";
-        // AllData.chartData3.yAxis2_Name = "满管风险";
-        // AllData.refresh3++;
-        AllData.chartData3.xAxis = res.data.regionNameList;
-        AllData.chartData3.yAxis1_bar = null;
-        AllData.chartData3.yAxis1_bar_Name = "";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis2_line = res.data.fullPipeTimesList;
-        AllData.chartData3.yAxis2_line_Name = "满管";
-        AllData.chartData3.yAxis2_line_Index = 0;
-        AllData.chartData3.yAxis3_line = res.data.overFlowRiskTimesList;
-        AllData.chartData3.yAxis3_line_Name = "溢流";
-        AllData.chartData3.yAxis3_line_Index = 0;
-        AllData.chartData3.y1_Unit = "次"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-        AllData.TjData3 = null;
-        AllData.TjData3Unit = null;
-      }
-    }
-  });
-};
-
-// 获取数据 谢杨  一级界面的河湖排口/ 二级界面的河湖排口
-const getData3 = () => {
-  MonitorAPI.outletList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.inflowWater;
-        AllData.chartData3.yAxis1_bar_Name = "进水量";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.outletsNumber;
-        AllData.chartData3.yAxis3_line_Name = "排口";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        AllData.refresh3++;
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "two") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.outletsNumber;
-        AllData.chartData3.yAxis1_bar_Name = "排口";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.inflowWater;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        // nextTick(() => {
-        //   debugger;
-        AllData.refresh3++;
-        // }, 1000);
-
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢杨  三级界面的渍水风险点/ 四级界面的渍水风险点
-const getData4 = () => {
-  //
-  MonitorAPI.pointList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "three") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.pointNumber;
-        AllData.chartData3.yAxis1_bar_Name = "渍水风险点";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "风险排口";
-        AllData.chartData3.yAxis3_line = null;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-
-        AllData.TjData3 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        //
-        AllData.chartData2.xAxis = res.data.partitionName;
-        AllData.chartData2.yAxis = null;
-        AllData.chartData2.yAxis2 = res.data.pointNumber;
-        AllData.chartData2.yAxis2_Name = "数量";
-        AllData.chartData2.yAxis_Name = null;
-        AllData.chartData2.y1_Unit = "个";
-        AllData.refresh2++;
-
-        AllData.TjData2 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢扬 一级界面的河湖水情
-const getData7 = () => {
-  MonitorAPI.queryWaterLevel({}).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        let XData = [];
-        let data1 = []; //当前水位
-        let data2 = []; //设防水位
-        let data3 = []; //调蓄容积
-        res.data.forEach((element) => {
-          XData.push(element.lakeName);
-          data1.push(element.nowWaterlevel);
-          data2.push(element.bestPromitWaterlevel);
-          data3.push(element.volume);
-        });
-        AllData.chartData1.xAxis = XData; //X轴数据
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData1.y2_Unit = "m"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = data3; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageVolume; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "可排水量"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = data2;
-        AllData.chartData1.yAxis2_line_Name = "控制水位";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = data1;
-        AllData.chartData1.yAxis3_line_Name = "当前水位";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-        AllData.TjData1 = null;
-        AllData.TjData1Unit = null;
-      }
-    }
-  });
-};
-// 获取数据 刘芳阳  / 三级 当日水量分析 /四级当日水量分析
-const getData5 = () => {
-  MonitorAPI.waterRegionWaterYieldAnalysis({
-    waterRegionId: AllData.waterRegionCode,
-  }).then((res) => {
-    if (res && res.code == 200) {
-      let XData = [];
-      let YData1 = [];
-      let YData2 = [];
-      let YData3 = [];
-      res.data.forEach((element) => {
-        XData.push(element.waterRegionName); //X轴数据
-        YData1.push(element.siteNum); //点位数量
-        YData2.push(element.inWaterYield); //进水
-        YData3.push(element.outWaterYield); //出水
-      });
-      if (AllData.regionGrade == "three") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = YData2;
-        AllData.chartData1.yAxis2_line_Name = "进水";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-
-        AllData.TjData2 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "接驳点数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.realTimeDrainage; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "实时排水量"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
         AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "进水";
+        AllData.chartData1.yAxis2_line_Name = "";
         AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
+        AllData.chartData1.yAxis3_line = null;
+        AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
+        AllData.TjData1 = res.data.drainageVolume
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData1Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨   三级界面的排水类别/四级界面的排水类别
+const getData4 = () => {
+  MonitorAPI.queryDrainageType({ regionId: AllData.waterRegionCode }).then((res) => {
+    if (res && res.code == 200) {
+      if (AllData.regionGrade == "three" || AllData.regionGrade == "four") {
+        // 三级Ecahrts 名称
+        AllData.chartData2.xAxis = res.data.typeName;
+        AllData.chartData2.yAxis = null;
+        AllData.chartData2.yAxis_Name = "";
+        AllData.chartData2.yAxis2 = res.data.typeNumber;
+        AllData.chartData2.yAxis2_Name = "数量";
+        AllData.chartData2.y1_Unit = "个";
+        AllData.refresh2++;
+        AllData.TjData1 = res.data.typeNumber
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(2);
         AllData.TjData1Unit = "个";
       }
+      //   数据赋值
     }
   });
 };
@@ -1129,8 +1016,8 @@
     if (!newfiberMap) return;
     bus.on("FenQuClick", FenQuClick);
     getData1();
+    getData2();
     getData3();
-    getData7();
     clearInterval(initeGLTimer);
   }, 100);
 });
@@ -1207,6 +1094,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
+        background-repeat: no-repeat;
+        background-size: contain;
 
         .SlList1P {
           width: 100%;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 51becf8..6532818 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -571,7 +571,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +580,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +589,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +598,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -1207,7 +1207,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
-
+        background-repeat: no-repeat;
+        background-size: contain;
         .SlList1P {
           width: 100%;
           height: 40px;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
index 3611592..1749922 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
@@ -133,6 +133,7 @@
               color: "#AAC1CF",
             },
             splitLine: {
+              show: false,
               lineStyle: {
                 type: "dashed",
                 color: "#2161a8",
@@ -194,12 +195,13 @@
             color: "#AAC1CF",
           },
           splitLine: {
+            show: false,
             lineStyle: {
               type: "dashed",
               color: "#2161a8",
             },
           },
-          alignTicks: true,
+          // alignTicks: true,
           position: "right",
           offset: 0,
         });
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
index b12fa14..3b717cc 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
@@ -87,7 +87,7 @@
             align: "right",
             fontSize: 10,
           },
-          max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
+          // max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
           nameLocation: "start",
           type: "value",
           minInterval: 1,
@@ -149,7 +149,7 @@
             // },
             data: props.data.yAxis,
             itemStyle: {
-              borderRadius: [20, 20, 20, 20],
+              borderRadius: [0, 20, 20, 0],
               color: "#FF6464",
             },
             label: {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
index 2e07f54..b2b57f4 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
@@ -148,7 +148,7 @@
               },
             },
             nameTextStyle: {
-              color: "#55FFC5",
+              color: "#b14de5",
             },
             splitLine: {
               lineStyle: {
@@ -208,12 +208,12 @@
             symbolSize: 7,
             // 修改折线颜色
             lineStyle: {
-              color: "#55FFC5", // 折线颜色
+              color: "#b14de5", // 折线颜色
               width: 2, // 折线宽度
             },
             // 修改数据点颜色
             itemStyle: {
-              color: "#55FFC5", // 数据点颜色
+              color: "#b14de5", // 数据点颜色
               width: 4,
             },
           },
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
index 0d94a78..aafc8e7 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
@@ -63,6 +63,7 @@
         </div>
       </div>
       
+      
         
     </div>
     <div class="nodata" v-else>
@@ -182,8 +183,19 @@
 <style lang="scss" scoped>
 .MonitoringAlarm {
   height: 100%;
+  :deep(.el-carousel){
+   height: calc(100% - 35px);
+   .el-carousel__container {
+   height: 100%;
+
+   }
+  .el-carousel__indicators {
+    display: none;
+  }
+  }
   .heatingPower {
-   height: calc(100% - 65px);
+  //  height: calc/(100% - 65px);
+   height: 100%;
     overflow-y: auto;
     padding: 30px 15px;
     position: relative;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 127f9d1..58e7308 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -188,7 +188,7 @@
             },
           },
           nameTextStyle: {
-            color: "#55FFC5",
+            color: "#b14de5",
           },
           splitLine: {
             lineStyle: {
@@ -274,12 +274,12 @@
           symbolSize: 7,
           // 修改折线颜色
           lineStyle: {
-            color: "#55FFC5", // 折线颜色
+            color: "#b14de5", // 折线颜色
             width: 2, // 折线宽度
           },
           // 修改数据点颜色
           itemStyle: {
-            color: "#55FFC5", // 数据点颜色
+            color: "#b14de5", // 数据点颜色
             width: 4,
           },
         },

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 9bfb855..ce15c3f 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -17,7 +17,7 @@
 <script setup name="streetscape">
 import { ref, reactive, toRefs, onMounted, nextTick, defineProps, watch } from "vue";
 // import bus from "@/bus";
-// import request from "@/utils/request";
+import request from "@/utils/request";
 import axios from "axios";
 const props = defineProps({
   // 数据id
@@ -50,19 +50,19 @@
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
 
-  let poiData = await axios({
+  let poiData = await request({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
       location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
         AllData.poiCircle[0].toFixed(6)
       )}`,
-      radius: 1000,
+      radius: 100,
       query: "公交站$商场$著名景点$学校",
     },
   });
-  if (poiData && poiData.data.data.length) {
-    AllData.poiData = poiData.data.data;
+  if (poiData && poiData.data.length) {
+    AllData.poiData = poiData.data;
     getStreetImg();
   }
 };
@@ -71,7 +71,7 @@
   AllData.poiImages = [];
   console.log("AllData.poiData---", AllData.poiData);
   AllData.poiData.forEach(async (element) => {
-    let data = await axios({
+    let data = await request({
       url: `/bdApi/baiduservice/panorama`,
       method: "GET",
       params: {
@@ -81,13 +81,15 @@
         width: 512,
       },
     });
-    if (data.data && data.data.data && data.data.data.status == 200) {
-      data.data.data.base64 = "data:image/jpeg;base64," + data.data.data.base64;
+    debugger;
+    if (data && data.data && data.data.status == 200) {
+      data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
       AllData.poiImages.push({
         name: element.name,
         lonlat: [element.location.lng, element.location.lat],
-        imagesUrl: data.data.data.base64,
+        imagesUrl: data.data.base64,
       });
+      selectPoiImgUrl(AllData.poiImages[0]);
     }
   });
   console.log("AllData.poiImages---", AllData.poiImages);
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index d732a0b..e910189 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -150,16 +150,21 @@
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if (filterList.value.length == 0)
       bus.emit('geoRegeo', {
         name: value,
         callback: results => {
-          filterList.value = results.geocodes.map((i, idx) => ({
-            id: idx,
-            name: i.formatted_address,
-            geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-            pointTypeName: '地理位置',
-          }));
+          if(!results.geocodes) return;
+          roadData.value = [
+            {
+              data:results.geocodes.map((i, idx) => ({
+                id: idx,
+                name: i.formatted_address,
+                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+                pointTypeName: '地理位置',
+              }))
+            }
+          ];
+          console.log('roadData.value',roadData.value);
         },
       });
   } else {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 45c2f01..95cce10 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -22,47 +22,42 @@
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖水情"
+                ? "排水户统计"
                 : AllData.regionGrade == "two"
-                ? "管网监测"
+                ? "排水户统计"
                 : AllData.regionGrade == "three"
-                ? "管网统计"
+                ? "排水户统计"
                 : AllData.regionGrade == "four"
-                ? "当日水量分析"
+                ? "水量统计"
                 : ""
             }}
             {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
           </div>
           <div class="modularBody">
-            <DraBarCharts2Y
-              v-if="
+            <!-- v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
-              "
+              " -->
+            <DraBarCharts2Y
               :data="AllData.chartData1"
               :refresh="AllData.refresh1"
               :ClickData="AllData.ClickData1"
             ></DraBarCharts2Y>
-            <DraBarChartsLeft
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData2"
-              :refresh="AllData.refresh2"
-              :ClickData="AllData.ClickData2"
-            ></DraBarChartsLeft>
           </div>
         </div>
         <div class="modular2">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "流域管网"
+                ? "管网统计"
                 : AllData.regionGrade == "two"
                 ? "管网统计"
                 : AllData.regionGrade == "three"
-                ? "当日水量分析"
+                ? "排水类别"
                 : AllData.regionGrade == "four"
-                ? "渍水风险点"
+                ? "排水类别"
                 : ""
             }}
             {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -72,32 +67,26 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
               "
               :data="AllData.chartData2"
               :refresh="AllData.refresh2"
               :ClickData="AllData.ClickData2"
             ></DraBarChartsLeft>
-
-            <DraBarCharts2Y
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData1"
-              :refresh="AllData.refresh1"
-              :ClickData="AllData.ClickData1"
-            ></DraBarCharts2Y>
           </div>
         </div>
         <div class="modular3">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "two"
-                ? "湖泊排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "three"
-                ? "渍水风险点"
+                ? "水量统计(日)"
                 : AllData.regionGrade == "four"
-                ? "历史风险"
+                ? "管网统计"
                 : ""
             }}
             {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -107,18 +96,13 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
-                AllData.regionGrade == 'three'
+                AllData.regionGrade == 'three' ||
+                AllData.regionGrade == 'four'
               "
               :data="AllData.chartData3"
               :refresh="AllData.refresh3"
               :ClickData="AllData.ClickData3"
             ></DraBarCharts2Y>
-            <DraLineChartsLeft
-              v-if="AllData.regionGrade == 'four'"
-              :data="AllData.chartData3"
-              :refresh="AllData.refresh3"
-              :ClickData="AllData.ClickData3"
-            />
           </div>
         </div></div
     ></Transition>
@@ -142,12 +126,12 @@
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
             <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
+            <div class="SLList">
               <div class="SlList1P">
                 <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">上游水量</div>
+              <div class="SlList2P">收水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
@@ -156,13 +140,6 @@
               </div>
               <div class="SlList2P">当前站点水量</div>
             </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <span class="SlListNum">{{ AllData.SLFX.downstreamSiteWaterYield }}</span>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">下游水量</div>
-            </div>
           </div>
         </div>
         <div class="modular3_right">
@@ -388,7 +365,6 @@
   ClickData3: "dgtxg",
   GWBD: {},
   SLFX: {},
-  isJBK: true, //是否为接驳口
   chartDataRight: {
     yAxis: [],
     yAxis_Name: "降雨量",
@@ -457,8 +433,8 @@
 
     // 切换时进行数据请求,默认视角请求
     getData1();
+    getData2();
     getData3();
-    getData7();
   }
   if (item.sort == 1) {
     bus.emit("panelDataToMap", {
@@ -513,9 +489,9 @@
     };
 
     // 切换时进行数据请求,默认视角请求
-    getData1();
+    getData2();
+    getData3();
     getData4();
-    getData5();
   }
   if (item.sort == 3) {
     bus.emit("panelDataToMap", {
@@ -530,9 +506,9 @@
       sort: 4,
     };
 
-    getData2();
+    getData3();
+    getData1();
     getData4();
-    getData5();
   }
   if (item.sort == 4) {
     bus.emit("panelDataToMap", {
@@ -571,7 +547,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +556,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +565,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +574,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -628,15 +604,15 @@
         } else if (AllData.regionGrade == "three") {
           // 三级
           console.log("三级");
-          getData1();
+          getData2();
+          getData3();
           getData4();
-          getData5();
         } else if (AllData.regionGrade == "four") {
           // 四级
           console.log("四级");
-          getData2();
+          getData3();
+          getData1();
           getData4();
-          getData5();
         } else {
           // 五级  五级为排水单元,由上可知,因为没有pid 所以此方法无效
           console.log("五级");
@@ -663,14 +639,6 @@
             AllData.GWBD = res.data[0];
           }
         });
-        //   根据type 判断是管井还是接驳口
-        if (Row.properties.type == "rainwater_pipeline_quality_area1") {
-          // 接驳口
-          AllData.isJBK = true;
-        } else {
-          // 管井或其他
-          AllData.isJBK = false;
-        }
         //   上下游水量分析
         getDataSXY(Row.properties);
         //   获取echarts数据
@@ -723,7 +691,7 @@
     sort: 4,
   };
 };
-// 获取数据 徐云欣  一级界面的流域管网/二级界面的管网统计/三级界面的管网统计
+// 获取数据 徐云欣  一级界面的管网统计/二级界面的管网统计/四级界面的管网统计
 const getData1 = () => {
   MonitorAPI.pipelineProblemStatistic({
     regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
@@ -733,7 +701,14 @@
     if (res && res.code == 200) {
       if (AllData.regionGrade == "one") {
         // 一级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
+        AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
@@ -742,288 +717,200 @@
       if (AllData.regionGrade == "two") {
         // 二级Ecahrts 名称
         AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
         AllData.TjData2Unit = "km";
       }
-      if (AllData.regionGrade == "three") {
-        // 三级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
-        AllData.TjData1 = res.data.pipelineLengthList
+      if (AllData.regionGrade == "four") {
+        AllData.chartData3.xAxis = res.data.problemNameList; //X轴数据
+        AllData.chartData3.y1_Unit = "km"; //Y轴单位
+        AllData.chartData3.y2_Unit = ""; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = res.data.pipelineProblemLengthList; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "片区管网问题"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = res.data.pipelineProblemLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(2);
-        AllData.TjData1Unit = "km";
+          .toFixed(0);
+        AllData.TjData3Unit = "km";
+        // // 二级Ecahrts 名称
+        // AllData.chartData2.yAxis_Name = "问题管网";
+        // //   数据赋值
+        // AllData.chartData2.xAxis = res.data.regionNameList;
+        // AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        // AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        // AllData.chartData2.yAxis2_Name = "总长度";
+        // AllData.chartData2.y1_Unit = "km";
+        // AllData.refresh2++;
+        // AllData.TjData2 = res.data.pipelineLengthList
+        //   .reduce((accu, curren) => Number(accu) + Number(curren))
+        //   .toFixed(2);
+        // AllData.TjData2Unit = "km";
       }
-      //   数据赋值
-      AllData.chartData2.xAxis = res.data.regionNameList;
-      AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
-      AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
-      AllData.chartData2.yAxis2_Name = "总长度";
-      AllData.chartData2.y1_Unit = "km";
-      AllData.refresh2++;
     }
   });
 };
-
-// 获取数据 徐云欣  二级界面的管网监测/四级界面的历史风险
+// 获取数据 刘芳阳  一级界面的污水水量(日)/二级界面的污水水量(日)/三级界面的水量统计(日)/四级界面的排水量
 const getData2 = () => {
-  MonitorAPI.pipelineRunRiskStatistic({
-    regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
-    regionName: AllData.regionName, //分区名称
-    regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-    // startTime: "", //开始时间（仅历史风险需要用到）
-    // endTime: "", //结束时间（仅历史风险需要用到）
+  MonitorAPI.sewageWaterRegionWaterYieldAnalysis({
+    sewageWaterRegionId: AllData.waterRegionCode ? AllData.waterRegionCode : 0,
   }).then((res) => {
     if (res && res.code == 200) {
+      let XData = []; //片区名称
+      let data1 = []; //站点数
+      let data2 = []; //进水量
+      let data3 = []; //出水量
+      res.data.forEach((element) => {
+        XData.push(element.waterRegionName);
+        data1.push(element.siteNum);
+        data2.push(element.inWaterYield);
+        data3.push(element.outWaterYield);
+      });
+      if (AllData.regionGrade == "one" || AllData.regionGrade == "three") {
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
       if (AllData.regionGrade == "two") {
-        AllData.chartData1.xAxis = res.data.regionNameList; //X轴数据
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = data3; //数据2
+        AllData.chartData3.yAxis2_bar_Name = "出水量"; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨  一级界面的排水户统计/ 二级界面的排水户统计/ 三级界面的排水户统计
+const getData3 = () => {
+  MonitorAPI.queryDrainageUserInfo({
+    regionId: AllData.waterRegionCode,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      if (
+        AllData.regionGrade == "one" ||
+        AllData.regionGrade == "two" ||
+        AllData.regionGrade == "three"
+      ) {
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = res.data.pipelinePointCount; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageNumber; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "排水户"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = res.data.pipelineRunRiskPointCount; //数据2
-        AllData.chartData1.yAxis2_bar_Name = "运行风险数"; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.keyDrainageNumber; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "重点排水户"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "";
-        AllData.chartData1.yAxis2_line_Index = 0;
+        AllData.chartData1.yAxis2_line = res.data.rtuNumber;
+        AllData.chartData1.yAxis2_line_Name = "监测设备";
+        AllData.chartData1.yAxis2_line_Index = 1;
         AllData.chartData1.yAxis3_line = null;
         AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = res.data.pipelinePointCount
+        AllData.TjData1 = res.data.drainageNumber
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(0);
         AllData.TjData1Unit = "个";
       }
       if (AllData.regionGrade == "four") {
-        // AllData.chartData3.xAxis = res.data.regionNameList;
-        // AllData.chartData3.yAxis = res.data.overFlowRiskTimesList; //溢流风险
-        // AllData.chartData3.yAxis2 = res.data.fullPipeTimesList; //满管风险
-        // AllData.chartData3.yAxis_Name = "溢流风险";
-        // AllData.chartData3.yAxis2_Name = "满管风险";
-        // AllData.refresh3++;
-        AllData.chartData3.xAxis = res.data.regionNameList;
-        AllData.chartData3.yAxis1_bar = null;
-        AllData.chartData3.yAxis1_bar_Name = "";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis2_line = res.data.fullPipeTimesList;
-        AllData.chartData3.yAxis2_line_Name = "满管";
-        AllData.chartData3.yAxis2_line_Index = 0;
-        AllData.chartData3.yAxis3_line = res.data.overFlowRiskTimesList;
-        AllData.chartData3.yAxis3_line_Name = "溢流";
-        AllData.chartData3.yAxis3_line_Index = 0;
-        AllData.chartData3.y1_Unit = "次"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-        AllData.TjData3 = null;
-        AllData.TjData3Unit = null;
-      }
-    }
-  });
-};
-
-// 获取数据 谢杨  一级界面的河湖排口/ 二级界面的河湖排口
-const getData3 = () => {
-  MonitorAPI.outletList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.inflowWater;
-        AllData.chartData3.yAxis1_bar_Name = "进水量";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.outletsNumber;
-        AllData.chartData3.yAxis3_line_Name = "排口";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        AllData.refresh3++;
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "two") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.outletsNumber;
-        AllData.chartData3.yAxis1_bar_Name = "排口";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.inflowWater;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        // nextTick(() => {
-        //   debugger;
-        AllData.refresh3++;
-        // }, 1000);
-
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢杨  三级界面的渍水风险点/ 四级界面的渍水风险点
-const getData4 = () => {
-  //
-  MonitorAPI.pointList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "three") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.pointNumber;
-        AllData.chartData3.yAxis1_bar_Name = "渍水风险点";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "风险排口";
-        AllData.chartData3.yAxis3_line = null;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-
-        AllData.TjData3 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        //
-        AllData.chartData2.xAxis = res.data.partitionName;
-        AllData.chartData2.yAxis = null;
-        AllData.chartData2.yAxis2 = res.data.pointNumber;
-        AllData.chartData2.yAxis2_Name = "数量";
-        AllData.chartData2.yAxis_Name = null;
-        AllData.chartData2.y1_Unit = "个";
-        AllData.refresh2++;
-
-        AllData.TjData2 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢扬 一级界面的河湖水情
-const getData7 = () => {
-  MonitorAPI.queryWaterLevel({}).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        let XData = [];
-        let data1 = []; //当前水位
-        let data2 = []; //设防水位
-        let data3 = []; //调蓄容积
-        res.data.forEach((element) => {
-          XData.push(element.lakeName);
-          data1.push(element.nowWaterlevel);
-          data2.push(element.bestPromitWaterlevel);
-          data3.push(element.volume);
-        });
-        AllData.chartData1.xAxis = XData; //X轴数据
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData1.y2_Unit = "m"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = data3; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageVolume; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "可排水量"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = data2;
-        AllData.chartData1.yAxis2_line_Name = "控制水位";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = data1;
-        AllData.chartData1.yAxis3_line_Name = "当前水位";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-        AllData.TjData1 = null;
-        AllData.TjData1Unit = null;
-      }
-    }
-  });
-};
-// 获取数据 刘芳阳  / 三级 当日水量分析 /四级当日水量分析
-const getData5 = () => {
-  MonitorAPI.waterRegionWaterYieldAnalysis({
-    waterRegionId: AllData.waterRegionCode,
-  }).then((res) => {
-    if (res && res.code == 200) {
-      let XData = [];
-      let YData1 = [];
-      let YData2 = [];
-      let YData3 = [];
-      res.data.forEach((element) => {
-        XData.push(element.waterRegionName); //X轴数据
-        YData1.push(element.siteNum); //点位数量
-        YData2.push(element.inWaterYield); //进水
-        YData3.push(element.outWaterYield); //出水
-      });
-      if (AllData.regionGrade == "three") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = YData2;
-        AllData.chartData1.yAxis2_line_Name = "进水";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-
-        AllData.TjData2 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "接驳点数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.realTimeDrainage; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "实时排水量"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
         AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "进水";
+        AllData.chartData1.yAxis2_line_Name = "";
         AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
+        AllData.chartData1.yAxis3_line = null;
+        AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
+        AllData.TjData1 = res.data.drainageVolume
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData1Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨   三级界面的排水类别/四级界面的排水类别
+const getData4 = () => {
+  MonitorAPI.queryDrainageType({ regionId: AllData.waterRegionCode }).then((res) => {
+    if (res && res.code == 200) {
+      if (AllData.regionGrade == "three" || AllData.regionGrade == "four") {
+        // 三级Ecahrts 名称
+        AllData.chartData2.xAxis = res.data.typeName;
+        AllData.chartData2.yAxis = null;
+        AllData.chartData2.yAxis_Name = "";
+        AllData.chartData2.yAxis2 = res.data.typeNumber;
+        AllData.chartData2.yAxis2_Name = "数量";
+        AllData.chartData2.y1_Unit = "个";
+        AllData.refresh2++;
+        AllData.TjData1 = res.data.typeNumber
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(2);
         AllData.TjData1Unit = "个";
       }
+      //   数据赋值
     }
   });
 };
@@ -1129,8 +1016,8 @@
     if (!newfiberMap) return;
     bus.on("FenQuClick", FenQuClick);
     getData1();
+    getData2();
     getData3();
-    getData7();
     clearInterval(initeGLTimer);
   }, 100);
 });
@@ -1207,6 +1094,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
+        background-repeat: no-repeat;
+        background-size: contain;
 
         .SlList1P {
           width: 100%;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 51becf8..6532818 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -571,7 +571,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +580,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +589,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +598,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -1207,7 +1207,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
-
+        background-repeat: no-repeat;
+        background-size: contain;
         .SlList1P {
           width: 100%;
           height: 40px;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
index 3611592..1749922 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
@@ -133,6 +133,7 @@
               color: "#AAC1CF",
             },
             splitLine: {
+              show: false,
               lineStyle: {
                 type: "dashed",
                 color: "#2161a8",
@@ -194,12 +195,13 @@
             color: "#AAC1CF",
           },
           splitLine: {
+            show: false,
             lineStyle: {
               type: "dashed",
               color: "#2161a8",
             },
           },
-          alignTicks: true,
+          // alignTicks: true,
           position: "right",
           offset: 0,
         });
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
index b12fa14..3b717cc 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
@@ -87,7 +87,7 @@
             align: "right",
             fontSize: 10,
           },
-          max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
+          // max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
           nameLocation: "start",
           type: "value",
           minInterval: 1,
@@ -149,7 +149,7 @@
             // },
             data: props.data.yAxis,
             itemStyle: {
-              borderRadius: [20, 20, 20, 20],
+              borderRadius: [0, 20, 20, 0],
               color: "#FF6464",
             },
             label: {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
index 2e07f54..b2b57f4 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
@@ -148,7 +148,7 @@
               },
             },
             nameTextStyle: {
-              color: "#55FFC5",
+              color: "#b14de5",
             },
             splitLine: {
               lineStyle: {
@@ -208,12 +208,12 @@
             symbolSize: 7,
             // 修改折线颜色
             lineStyle: {
-              color: "#55FFC5", // 折线颜色
+              color: "#b14de5", // 折线颜色
               width: 2, // 折线宽度
             },
             // 修改数据点颜色
             itemStyle: {
-              color: "#55FFC5", // 数据点颜色
+              color: "#b14de5", // 数据点颜色
               width: 4,
             },
           },
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
index 0d94a78..aafc8e7 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
@@ -63,6 +63,7 @@
         </div>
       </div>
       
+      
         
     </div>
     <div class="nodata" v-else>
@@ -182,8 +183,19 @@
 <style lang="scss" scoped>
 .MonitoringAlarm {
   height: 100%;
+  :deep(.el-carousel){
+   height: calc(100% - 35px);
+   .el-carousel__container {
+   height: 100%;
+
+   }
+  .el-carousel__indicators {
+    display: none;
+  }
+  }
   .heatingPower {
-   height: calc(100% - 65px);
+  //  height: calc/(100% - 65px);
+   height: 100%;
     overflow-y: auto;
     padding: 30px 15px;
     position: relative;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 127f9d1..58e7308 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -188,7 +188,7 @@
             },
           },
           nameTextStyle: {
-            color: "#55FFC5",
+            color: "#b14de5",
           },
           splitLine: {
             lineStyle: {
@@ -274,12 +274,12 @@
           symbolSize: 7,
           // 修改折线颜色
           lineStyle: {
-            color: "#55FFC5", // 折线颜色
+            color: "#b14de5", // 折线颜色
             width: 2, // 折线宽度
           },
           // 修改数据点颜色
           itemStyle: {
-            color: "#55FFC5", // 数据点颜色
+            color: "#b14de5", // 数据点颜色
             width: 4,
           },
         },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index 1c52b08..6940c5a 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -189,7 +189,7 @@
             },
           },
           nameTextStyle: {
-            color: "#55FFC5",
+            color: "#b14de5",
           },
           splitLine: {
             lineStyle: {
@@ -275,12 +275,12 @@
           symbolSize: 7,
           // 修改折线颜色
           lineStyle: {
-            color: "#55FFC5", // 折线颜色
+            color: "#b14de5", // 折线颜色
             width: 2, // 折线宽度
           },
           // 修改数据点颜色
           itemStyle: {
-            color: "#55FFC5", // 数据点颜色
+            color: "#b14de5", // 数据点颜色
             width: 4,
           },
         },

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 9bfb855..ce15c3f 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -17,7 +17,7 @@
 <script setup name="streetscape">
 import { ref, reactive, toRefs, onMounted, nextTick, defineProps, watch } from "vue";
 // import bus from "@/bus";
-// import request from "@/utils/request";
+import request from "@/utils/request";
 import axios from "axios";
 const props = defineProps({
   // 数据id
@@ -50,19 +50,19 @@
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
 
-  let poiData = await axios({
+  let poiData = await request({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
       location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
         AllData.poiCircle[0].toFixed(6)
       )}`,
-      radius: 1000,
+      radius: 100,
       query: "公交站$商场$著名景点$学校",
     },
   });
-  if (poiData && poiData.data.data.length) {
-    AllData.poiData = poiData.data.data;
+  if (poiData && poiData.data.length) {
+    AllData.poiData = poiData.data;
     getStreetImg();
   }
 };
@@ -71,7 +71,7 @@
   AllData.poiImages = [];
   console.log("AllData.poiData---", AllData.poiData);
   AllData.poiData.forEach(async (element) => {
-    let data = await axios({
+    let data = await request({
       url: `/bdApi/baiduservice/panorama`,
       method: "GET",
       params: {
@@ -81,13 +81,15 @@
         width: 512,
       },
     });
-    if (data.data && data.data.data && data.data.data.status == 200) {
-      data.data.data.base64 = "data:image/jpeg;base64," + data.data.data.base64;
+    debugger;
+    if (data && data.data && data.data.status == 200) {
+      data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
       AllData.poiImages.push({
         name: element.name,
         lonlat: [element.location.lng, element.location.lat],
-        imagesUrl: data.data.data.base64,
+        imagesUrl: data.data.base64,
       });
+      selectPoiImgUrl(AllData.poiImages[0]);
     }
   });
   console.log("AllData.poiImages---", AllData.poiImages);
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index d732a0b..e910189 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -150,16 +150,21 @@
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if (filterList.value.length == 0)
       bus.emit('geoRegeo', {
         name: value,
         callback: results => {
-          filterList.value = results.geocodes.map((i, idx) => ({
-            id: idx,
-            name: i.formatted_address,
-            geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-            pointTypeName: '地理位置',
-          }));
+          if(!results.geocodes) return;
+          roadData.value = [
+            {
+              data:results.geocodes.map((i, idx) => ({
+                id: idx,
+                name: i.formatted_address,
+                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+                pointTypeName: '地理位置',
+              }))
+            }
+          ];
+          console.log('roadData.value',roadData.value);
         },
       });
   } else {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 45c2f01..95cce10 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -22,47 +22,42 @@
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖水情"
+                ? "排水户统计"
                 : AllData.regionGrade == "two"
-                ? "管网监测"
+                ? "排水户统计"
                 : AllData.regionGrade == "three"
-                ? "管网统计"
+                ? "排水户统计"
                 : AllData.regionGrade == "four"
-                ? "当日水量分析"
+                ? "水量统计"
                 : ""
             }}
             {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
           </div>
           <div class="modularBody">
-            <DraBarCharts2Y
-              v-if="
+            <!-- v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
-              "
+              " -->
+            <DraBarCharts2Y
               :data="AllData.chartData1"
               :refresh="AllData.refresh1"
               :ClickData="AllData.ClickData1"
             ></DraBarCharts2Y>
-            <DraBarChartsLeft
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData2"
-              :refresh="AllData.refresh2"
-              :ClickData="AllData.ClickData2"
-            ></DraBarChartsLeft>
           </div>
         </div>
         <div class="modular2">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "流域管网"
+                ? "管网统计"
                 : AllData.regionGrade == "two"
                 ? "管网统计"
                 : AllData.regionGrade == "three"
-                ? "当日水量分析"
+                ? "排水类别"
                 : AllData.regionGrade == "four"
-                ? "渍水风险点"
+                ? "排水类别"
                 : ""
             }}
             {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -72,32 +67,26 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
               "
               :data="AllData.chartData2"
               :refresh="AllData.refresh2"
               :ClickData="AllData.ClickData2"
             ></DraBarChartsLeft>
-
-            <DraBarCharts2Y
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData1"
-              :refresh="AllData.refresh1"
-              :ClickData="AllData.ClickData1"
-            ></DraBarCharts2Y>
           </div>
         </div>
         <div class="modular3">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "two"
-                ? "湖泊排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "three"
-                ? "渍水风险点"
+                ? "水量统计(日)"
                 : AllData.regionGrade == "four"
-                ? "历史风险"
+                ? "管网统计"
                 : ""
             }}
             {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -107,18 +96,13 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
-                AllData.regionGrade == 'three'
+                AllData.regionGrade == 'three' ||
+                AllData.regionGrade == 'four'
               "
               :data="AllData.chartData3"
               :refresh="AllData.refresh3"
               :ClickData="AllData.ClickData3"
             ></DraBarCharts2Y>
-            <DraLineChartsLeft
-              v-if="AllData.regionGrade == 'four'"
-              :data="AllData.chartData3"
-              :refresh="AllData.refresh3"
-              :ClickData="AllData.ClickData3"
-            />
           </div>
         </div></div
     ></Transition>
@@ -142,12 +126,12 @@
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
             <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
+            <div class="SLList">
               <div class="SlList1P">
                 <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">上游水量</div>
+              <div class="SlList2P">收水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
@@ -156,13 +140,6 @@
               </div>
               <div class="SlList2P">当前站点水量</div>
             </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <span class="SlListNum">{{ AllData.SLFX.downstreamSiteWaterYield }}</span>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">下游水量</div>
-            </div>
           </div>
         </div>
         <div class="modular3_right">
@@ -388,7 +365,6 @@
   ClickData3: "dgtxg",
   GWBD: {},
   SLFX: {},
-  isJBK: true, //是否为接驳口
   chartDataRight: {
     yAxis: [],
     yAxis_Name: "降雨量",
@@ -457,8 +433,8 @@
 
     // 切换时进行数据请求,默认视角请求
     getData1();
+    getData2();
     getData3();
-    getData7();
   }
   if (item.sort == 1) {
     bus.emit("panelDataToMap", {
@@ -513,9 +489,9 @@
     };
 
     // 切换时进行数据请求,默认视角请求
-    getData1();
+    getData2();
+    getData3();
     getData4();
-    getData5();
   }
   if (item.sort == 3) {
     bus.emit("panelDataToMap", {
@@ -530,9 +506,9 @@
       sort: 4,
     };
 
-    getData2();
+    getData3();
+    getData1();
     getData4();
-    getData5();
   }
   if (item.sort == 4) {
     bus.emit("panelDataToMap", {
@@ -571,7 +547,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +556,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +565,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +574,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -628,15 +604,15 @@
         } else if (AllData.regionGrade == "three") {
           // 三级
           console.log("三级");
-          getData1();
+          getData2();
+          getData3();
           getData4();
-          getData5();
         } else if (AllData.regionGrade == "four") {
           // 四级
           console.log("四级");
-          getData2();
+          getData3();
+          getData1();
           getData4();
-          getData5();
         } else {
           // 五级  五级为排水单元,由上可知,因为没有pid 所以此方法无效
           console.log("五级");
@@ -663,14 +639,6 @@
             AllData.GWBD = res.data[0];
           }
         });
-        //   根据type 判断是管井还是接驳口
-        if (Row.properties.type == "rainwater_pipeline_quality_area1") {
-          // 接驳口
-          AllData.isJBK = true;
-        } else {
-          // 管井或其他
-          AllData.isJBK = false;
-        }
         //   上下游水量分析
         getDataSXY(Row.properties);
         //   获取echarts数据
@@ -723,7 +691,7 @@
     sort: 4,
   };
 };
-// 获取数据 徐云欣  一级界面的流域管网/二级界面的管网统计/三级界面的管网统计
+// 获取数据 徐云欣  一级界面的管网统计/二级界面的管网统计/四级界面的管网统计
 const getData1 = () => {
   MonitorAPI.pipelineProblemStatistic({
     regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
@@ -733,7 +701,14 @@
     if (res && res.code == 200) {
       if (AllData.regionGrade == "one") {
         // 一级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
+        AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
@@ -742,288 +717,200 @@
       if (AllData.regionGrade == "two") {
         // 二级Ecahrts 名称
         AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
         AllData.TjData2Unit = "km";
       }
-      if (AllData.regionGrade == "three") {
-        // 三级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
-        AllData.TjData1 = res.data.pipelineLengthList
+      if (AllData.regionGrade == "four") {
+        AllData.chartData3.xAxis = res.data.problemNameList; //X轴数据
+        AllData.chartData3.y1_Unit = "km"; //Y轴单位
+        AllData.chartData3.y2_Unit = ""; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = res.data.pipelineProblemLengthList; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "片区管网问题"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = res.data.pipelineProblemLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(2);
-        AllData.TjData1Unit = "km";
+          .toFixed(0);
+        AllData.TjData3Unit = "km";
+        // // 二级Ecahrts 名称
+        // AllData.chartData2.yAxis_Name = "问题管网";
+        // //   数据赋值
+        // AllData.chartData2.xAxis = res.data.regionNameList;
+        // AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        // AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        // AllData.chartData2.yAxis2_Name = "总长度";
+        // AllData.chartData2.y1_Unit = "km";
+        // AllData.refresh2++;
+        // AllData.TjData2 = res.data.pipelineLengthList
+        //   .reduce((accu, curren) => Number(accu) + Number(curren))
+        //   .toFixed(2);
+        // AllData.TjData2Unit = "km";
       }
-      //   数据赋值
-      AllData.chartData2.xAxis = res.data.regionNameList;
-      AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
-      AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
-      AllData.chartData2.yAxis2_Name = "总长度";
-      AllData.chartData2.y1_Unit = "km";
-      AllData.refresh2++;
     }
   });
 };
-
-// 获取数据 徐云欣  二级界面的管网监测/四级界面的历史风险
+// 获取数据 刘芳阳  一级界面的污水水量(日)/二级界面的污水水量(日)/三级界面的水量统计(日)/四级界面的排水量
 const getData2 = () => {
-  MonitorAPI.pipelineRunRiskStatistic({
-    regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
-    regionName: AllData.regionName, //分区名称
-    regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-    // startTime: "", //开始时间（仅历史风险需要用到）
-    // endTime: "", //结束时间（仅历史风险需要用到）
+  MonitorAPI.sewageWaterRegionWaterYieldAnalysis({
+    sewageWaterRegionId: AllData.waterRegionCode ? AllData.waterRegionCode : 0,
   }).then((res) => {
     if (res && res.code == 200) {
+      let XData = []; //片区名称
+      let data1 = []; //站点数
+      let data2 = []; //进水量
+      let data3 = []; //出水量
+      res.data.forEach((element) => {
+        XData.push(element.waterRegionName);
+        data1.push(element.siteNum);
+        data2.push(element.inWaterYield);
+        data3.push(element.outWaterYield);
+      });
+      if (AllData.regionGrade == "one" || AllData.regionGrade == "three") {
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
       if (AllData.regionGrade == "two") {
-        AllData.chartData1.xAxis = res.data.regionNameList; //X轴数据
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = data3; //数据2
+        AllData.chartData3.yAxis2_bar_Name = "出水量"; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨  一级界面的排水户统计/ 二级界面的排水户统计/ 三级界面的排水户统计
+const getData3 = () => {
+  MonitorAPI.queryDrainageUserInfo({
+    regionId: AllData.waterRegionCode,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      if (
+        AllData.regionGrade == "one" ||
+        AllData.regionGrade == "two" ||
+        AllData.regionGrade == "three"
+      ) {
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = res.data.pipelinePointCount; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageNumber; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "排水户"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = res.data.pipelineRunRiskPointCount; //数据2
-        AllData.chartData1.yAxis2_bar_Name = "运行风险数"; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.keyDrainageNumber; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "重点排水户"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "";
-        AllData.chartData1.yAxis2_line_Index = 0;
+        AllData.chartData1.yAxis2_line = res.data.rtuNumber;
+        AllData.chartData1.yAxis2_line_Name = "监测设备";
+        AllData.chartData1.yAxis2_line_Index = 1;
         AllData.chartData1.yAxis3_line = null;
         AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = res.data.pipelinePointCount
+        AllData.TjData1 = res.data.drainageNumber
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(0);
         AllData.TjData1Unit = "个";
       }
       if (AllData.regionGrade == "four") {
-        // AllData.chartData3.xAxis = res.data.regionNameList;
-        // AllData.chartData3.yAxis = res.data.overFlowRiskTimesList; //溢流风险
-        // AllData.chartData3.yAxis2 = res.data.fullPipeTimesList; //满管风险
-        // AllData.chartData3.yAxis_Name = "溢流风险";
-        // AllData.chartData3.yAxis2_Name = "满管风险";
-        // AllData.refresh3++;
-        AllData.chartData3.xAxis = res.data.regionNameList;
-        AllData.chartData3.yAxis1_bar = null;
-        AllData.chartData3.yAxis1_bar_Name = "";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis2_line = res.data.fullPipeTimesList;
-        AllData.chartData3.yAxis2_line_Name = "满管";
-        AllData.chartData3.yAxis2_line_Index = 0;
-        AllData.chartData3.yAxis3_line = res.data.overFlowRiskTimesList;
-        AllData.chartData3.yAxis3_line_Name = "溢流";
-        AllData.chartData3.yAxis3_line_Index = 0;
-        AllData.chartData3.y1_Unit = "次"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-        AllData.TjData3 = null;
-        AllData.TjData3Unit = null;
-      }
-    }
-  });
-};
-
-// 获取数据 谢杨  一级界面的河湖排口/ 二级界面的河湖排口
-const getData3 = () => {
-  MonitorAPI.outletList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.inflowWater;
-        AllData.chartData3.yAxis1_bar_Name = "进水量";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.outletsNumber;
-        AllData.chartData3.yAxis3_line_Name = "排口";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        AllData.refresh3++;
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "two") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.outletsNumber;
-        AllData.chartData3.yAxis1_bar_Name = "排口";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.inflowWater;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        // nextTick(() => {
-        //   debugger;
-        AllData.refresh3++;
-        // }, 1000);
-
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢杨  三级界面的渍水风险点/ 四级界面的渍水风险点
-const getData4 = () => {
-  //
-  MonitorAPI.pointList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "three") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.pointNumber;
-        AllData.chartData3.yAxis1_bar_Name = "渍水风险点";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "风险排口";
-        AllData.chartData3.yAxis3_line = null;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-
-        AllData.TjData3 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        //
-        AllData.chartData2.xAxis = res.data.partitionName;
-        AllData.chartData2.yAxis = null;
-        AllData.chartData2.yAxis2 = res.data.pointNumber;
-        AllData.chartData2.yAxis2_Name = "数量";
-        AllData.chartData2.yAxis_Name = null;
-        AllData.chartData2.y1_Unit = "个";
-        AllData.refresh2++;
-
-        AllData.TjData2 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢扬 一级界面的河湖水情
-const getData7 = () => {
-  MonitorAPI.queryWaterLevel({}).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        let XData = [];
-        let data1 = []; //当前水位
-        let data2 = []; //设防水位
-        let data3 = []; //调蓄容积
-        res.data.forEach((element) => {
-          XData.push(element.lakeName);
-          data1.push(element.nowWaterlevel);
-          data2.push(element.bestPromitWaterlevel);
-          data3.push(element.volume);
-        });
-        AllData.chartData1.xAxis = XData; //X轴数据
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData1.y2_Unit = "m"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = data3; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageVolume; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "可排水量"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = data2;
-        AllData.chartData1.yAxis2_line_Name = "控制水位";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = data1;
-        AllData.chartData1.yAxis3_line_Name = "当前水位";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-        AllData.TjData1 = null;
-        AllData.TjData1Unit = null;
-      }
-    }
-  });
-};
-// 获取数据 刘芳阳  / 三级 当日水量分析 /四级当日水量分析
-const getData5 = () => {
-  MonitorAPI.waterRegionWaterYieldAnalysis({
-    waterRegionId: AllData.waterRegionCode,
-  }).then((res) => {
-    if (res && res.code == 200) {
-      let XData = [];
-      let YData1 = [];
-      let YData2 = [];
-      let YData3 = [];
-      res.data.forEach((element) => {
-        XData.push(element.waterRegionName); //X轴数据
-        YData1.push(element.siteNum); //点位数量
-        YData2.push(element.inWaterYield); //进水
-        YData3.push(element.outWaterYield); //出水
-      });
-      if (AllData.regionGrade == "three") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = YData2;
-        AllData.chartData1.yAxis2_line_Name = "进水";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-
-        AllData.TjData2 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "接驳点数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.realTimeDrainage; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "实时排水量"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
         AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "进水";
+        AllData.chartData1.yAxis2_line_Name = "";
         AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
+        AllData.chartData1.yAxis3_line = null;
+        AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
+        AllData.TjData1 = res.data.drainageVolume
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData1Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨   三级界面的排水类别/四级界面的排水类别
+const getData4 = () => {
+  MonitorAPI.queryDrainageType({ regionId: AllData.waterRegionCode }).then((res) => {
+    if (res && res.code == 200) {
+      if (AllData.regionGrade == "three" || AllData.regionGrade == "four") {
+        // 三级Ecahrts 名称
+        AllData.chartData2.xAxis = res.data.typeName;
+        AllData.chartData2.yAxis = null;
+        AllData.chartData2.yAxis_Name = "";
+        AllData.chartData2.yAxis2 = res.data.typeNumber;
+        AllData.chartData2.yAxis2_Name = "数量";
+        AllData.chartData2.y1_Unit = "个";
+        AllData.refresh2++;
+        AllData.TjData1 = res.data.typeNumber
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(2);
         AllData.TjData1Unit = "个";
       }
+      //   数据赋值
     }
   });
 };
@@ -1129,8 +1016,8 @@
     if (!newfiberMap) return;
     bus.on("FenQuClick", FenQuClick);
     getData1();
+    getData2();
     getData3();
-    getData7();
     clearInterval(initeGLTimer);
   }, 100);
 });
@@ -1207,6 +1094,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
+        background-repeat: no-repeat;
+        background-size: contain;
 
         .SlList1P {
           width: 100%;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 51becf8..6532818 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -571,7 +571,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +580,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +589,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +598,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -1207,7 +1207,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
-
+        background-repeat: no-repeat;
+        background-size: contain;
         .SlList1P {
           width: 100%;
           height: 40px;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
index 3611592..1749922 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
@@ -133,6 +133,7 @@
               color: "#AAC1CF",
             },
             splitLine: {
+              show: false,
               lineStyle: {
                 type: "dashed",
                 color: "#2161a8",
@@ -194,12 +195,13 @@
             color: "#AAC1CF",
           },
           splitLine: {
+            show: false,
             lineStyle: {
               type: "dashed",
               color: "#2161a8",
             },
           },
-          alignTicks: true,
+          // alignTicks: true,
           position: "right",
           offset: 0,
         });
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
index b12fa14..3b717cc 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
@@ -87,7 +87,7 @@
             align: "right",
             fontSize: 10,
           },
-          max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
+          // max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
           nameLocation: "start",
           type: "value",
           minInterval: 1,
@@ -149,7 +149,7 @@
             // },
             data: props.data.yAxis,
             itemStyle: {
-              borderRadius: [20, 20, 20, 20],
+              borderRadius: [0, 20, 20, 0],
               color: "#FF6464",
             },
             label: {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
index 2e07f54..b2b57f4 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
@@ -148,7 +148,7 @@
               },
             },
             nameTextStyle: {
-              color: "#55FFC5",
+              color: "#b14de5",
             },
             splitLine: {
               lineStyle: {
@@ -208,12 +208,12 @@
             symbolSize: 7,
             // 修改折线颜色
             lineStyle: {
-              color: "#55FFC5", // 折线颜色
+              color: "#b14de5", // 折线颜色
               width: 2, // 折线宽度
             },
             // 修改数据点颜色
             itemStyle: {
-              color: "#55FFC5", // 数据点颜色
+              color: "#b14de5", // 数据点颜色
               width: 4,
             },
           },
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
index 0d94a78..aafc8e7 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
@@ -63,6 +63,7 @@
         </div>
       </div>
       
+      
         
     </div>
     <div class="nodata" v-else>
@@ -182,8 +183,19 @@
 <style lang="scss" scoped>
 .MonitoringAlarm {
   height: 100%;
+  :deep(.el-carousel){
+   height: calc(100% - 35px);
+   .el-carousel__container {
+   height: 100%;
+
+   }
+  .el-carousel__indicators {
+    display: none;
+  }
+  }
   .heatingPower {
-   height: calc(100% - 65px);
+  //  height: calc/(100% - 65px);
+   height: 100%;
     overflow-y: auto;
     padding: 30px 15px;
     position: relative;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 127f9d1..58e7308 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -188,7 +188,7 @@
             },
           },
           nameTextStyle: {
-            color: "#55FFC5",
+            color: "#b14de5",
           },
           splitLine: {
             lineStyle: {
@@ -274,12 +274,12 @@
           symbolSize: 7,
           // 修改折线颜色
           lineStyle: {
-            color: "#55FFC5", // 折线颜色
+            color: "#b14de5", // 折线颜色
             width: 2, // 折线宽度
           },
           // 修改数据点颜色
           itemStyle: {
-            color: "#55FFC5", // 数据点颜色
+            color: "#b14de5", // 数据点颜色
             width: 4,
           },
         },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index 1c52b08..6940c5a 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -189,7 +189,7 @@
             },
           },
           nameTextStyle: {
-            color: "#55FFC5",
+            color: "#b14de5",
           },
           splitLine: {
             lineStyle: {
@@ -275,12 +275,12 @@
           symbolSize: 7,
           // 修改折线颜色
           lineStyle: {
-            color: "#55FFC5", // 折线颜色
+            color: "#b14de5", // 折线颜色
             width: 2, // 折线宽度
           },
           // 修改数据点颜色
           itemStyle: {
-            color: "#55FFC5", // 数据点颜色
+            color: "#b14de5", // 数据点颜色
             width: 4,
           },
         },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
index 9b4b37d..98c1ac6 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
@@ -182,7 +182,7 @@
             },
           },
           nameTextStyle: {
-            color: "#55FFC5",
+            color: "#b14de5",
           },
           splitLine: {
             lineStyle: {
@@ -242,12 +242,12 @@
           symbolSize: 7,
           // 修改折线颜色
           lineStyle: {
-            color: "#55FFC5", // 折线颜色
+            color: "#b14de5", // 折线颜色
             width: 2, // 折线宽度
           },
           // 修改数据点颜色
           itemStyle: {
-            color: "#55FFC5", // 数据点颜色
+            color: "#b14de5", // 数据点颜色
             width: 4,
           },
         },

diff --git a/public/static/libs/mapbox/night-style1.json b/public/static/libs/mapbox/night-style1.json
index 531aabf..589ff47 100644
--- a/public/static/libs/mapbox/night-style1.json
+++ b/public/static/libs/mapbox/night-style1.json
@@ -30,7 +30,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landuse",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -59,7 +59,7 @@
             "type": "fill",
             "source": "openmaptiles",
             "source-layer": "landcover",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "class",
@@ -257,7 +257,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -313,7 +313,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "waterway",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -615,7 +615,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -656,7 +656,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -772,7 +772,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1063,7 +1063,7 @@
             "type": "line",
             "source": "openmaptiles",
             "source-layer": "transportation",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1716,7 +1716,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "poi",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -1792,14 +1792,15 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "transportation_name",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "==",
                 "$type",
                 "LineString"
             ],
             "layout": {
-                "symbol-placement": "line",
+                "symbol-placement": "line-center",
+                "symbol-spacing": 40,
                 "text-field": " {name:nonlatin}",
                 "text-font": [
                     "KlokanTech Noto Sans Regular"
@@ -1834,7 +1835,7 @@
             "type": "symbol",
             "source": "openmaptiles",
             "source-layer": "place",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
@@ -2008,7 +2009,7 @@
             "metadata": {},
             "source": "openmaptiles",
             "source-layer": "building",
-            "minzoom": 14,
+            "minzoom": 13.5,
             "filter": [
                 "all",
                 [
diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index f06424f..2a2f78a 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -1165,10 +1165,10 @@
         ],
         "text-size": 13,
         "text-justify": "left",
-        "text-anchor": "top",
+        "text-anchor": "bottom",
         "text-line-height": 1.3,
         "text-max-width": 10,
-        "text-offset": [0,1.5],
+        "text-offset": [4.5,-2.0],
         "text-optional": true
       },
       "mType": "geojson"
diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 56cbaf8..9e999e6 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -112,4 +112,28 @@
     method: 'get',
     params,
   });
+}
+// 污水水量
+export function sewageWaterRegionWaterYieldAnalysis(params) {
+  return request({
+    url: `business/monitorData/sewageWaterRegionWaterYieldAnalysis`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户分类
+export function queryDrainageType(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageType`,
+    method: 'get',
+    params,
+  });
+}
+// 排水户明细
+export function queryDrainageUserInfo(params) {
+  return request({
+    url: `business/drainageSystem/queryDrainageUserInfo`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 9188758..76d4b2f 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -7,7 +7,9 @@
   >
   </MapBox>
 
-  <PopupInfo></PopupInfo>
+  <PopupInfo>
+    {{item?.aaa}}
+  </PopupInfo>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -84,6 +86,7 @@
     },
     psfq: {
       key: "排水分区",
+      text_key:"排水分区_text",
       prevIds: [],
       children: {
         WS: { key: "污水分区" },
@@ -131,7 +134,7 @@
     // 图层点击事件
     if (properties) {
       if(properties.type == _keys[4])properties.type = properties.pointType
-      bus.emit("FenQuClick", {properties,layerId});
+      bus.emit("FenQuClick", {properties,layerId:layerId.split('_')[0]});
     }
     clearTrajectory();
     // clearTemporaryData();
@@ -176,6 +179,11 @@
                 ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
                 areaToMap(properties);
               },
+              [psfq.text_key]: () => {
+                ['雨水系统流向','雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: false}));
+                ["outlet_info2",'排口流向','排口流向1','rainwater_pipeline_quality1',_keys[2]].forEach(k => busEmit(setLayerVisible.key, {layername:k, isCheck: true}));
+                areaToMap({...properties,geometry:Terraformer.WKT.convert(JSON.parse(properties.geometrys))});
+              },
               [town.key]: () => {
                 newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection(newfiberMap.map.getSource("hb_wh_gxq_cun2")._data.features.filter((i) => i.properties.type == properties.name)));
                 busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 9bfb855..ce15c3f 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -17,7 +17,7 @@
 <script setup name="streetscape">
 import { ref, reactive, toRefs, onMounted, nextTick, defineProps, watch } from "vue";
 // import bus from "@/bus";
-// import request from "@/utils/request";
+import request from "@/utils/request";
 import axios from "axios";
 const props = defineProps({
   // 数据id
@@ -50,19 +50,19 @@
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
 
-  let poiData = await axios({
+  let poiData = await request({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
       location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
         AllData.poiCircle[0].toFixed(6)
       )}`,
-      radius: 1000,
+      radius: 100,
       query: "公交站$商场$著名景点$学校",
     },
   });
-  if (poiData && poiData.data.data.length) {
-    AllData.poiData = poiData.data.data;
+  if (poiData && poiData.data.length) {
+    AllData.poiData = poiData.data;
     getStreetImg();
   }
 };
@@ -71,7 +71,7 @@
   AllData.poiImages = [];
   console.log("AllData.poiData---", AllData.poiData);
   AllData.poiData.forEach(async (element) => {
-    let data = await axios({
+    let data = await request({
       url: `/bdApi/baiduservice/panorama`,
       method: "GET",
       params: {
@@ -81,13 +81,15 @@
         width: 512,
       },
     });
-    if (data.data && data.data.data && data.data.data.status == 200) {
-      data.data.data.base64 = "data:image/jpeg;base64," + data.data.data.base64;
+    debugger;
+    if (data && data.data && data.data.status == 200) {
+      data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
       AllData.poiImages.push({
         name: element.name,
         lonlat: [element.location.lng, element.location.lat],
-        imagesUrl: data.data.data.base64,
+        imagesUrl: data.data.base64,
       });
+      selectPoiImgUrl(AllData.poiImages[0]);
     }
   });
   console.log("AllData.poiImages---", AllData.poiImages);
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index d732a0b..e910189 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -150,16 +150,21 @@
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if (filterList.value.length == 0)
       bus.emit('geoRegeo', {
         name: value,
         callback: results => {
-          filterList.value = results.geocodes.map((i, idx) => ({
-            id: idx,
-            name: i.formatted_address,
-            geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-            pointTypeName: '地理位置',
-          }));
+          if(!results.geocodes) return;
+          roadData.value = [
+            {
+              data:results.geocodes.map((i, idx) => ({
+                id: idx,
+                name: i.formatted_address,
+                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+                pointTypeName: '地理位置',
+              }))
+            }
+          ];
+          console.log('roadData.value',roadData.value);
         },
       });
   } else {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 45c2f01..95cce10 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -22,47 +22,42 @@
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖水情"
+                ? "排水户统计"
                 : AllData.regionGrade == "two"
-                ? "管网监测"
+                ? "排水户统计"
                 : AllData.regionGrade == "three"
-                ? "管网统计"
+                ? "排水户统计"
                 : AllData.regionGrade == "four"
-                ? "当日水量分析"
+                ? "水量统计"
                 : ""
             }}
             {{ AllData.TjData1 ? `(${AllData.TjData1 + AllData.TjData1Unit})` : `` }}
           </div>
           <div class="modularBody">
-            <DraBarCharts2Y
-              v-if="
+            <!-- v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
-              "
+              " -->
+            <DraBarCharts2Y
               :data="AllData.chartData1"
               :refresh="AllData.refresh1"
               :ClickData="AllData.ClickData1"
             ></DraBarCharts2Y>
-            <DraBarChartsLeft
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData2"
-              :refresh="AllData.refresh2"
-              :ClickData="AllData.ClickData2"
-            ></DraBarChartsLeft>
           </div>
         </div>
         <div class="modular2">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "流域管网"
+                ? "管网统计"
                 : AllData.regionGrade == "two"
                 ? "管网统计"
                 : AllData.regionGrade == "three"
-                ? "当日水量分析"
+                ? "排水类别"
                 : AllData.regionGrade == "four"
-                ? "渍水风险点"
+                ? "排水类别"
                 : ""
             }}
             {{ AllData.TjData2 ? `(${AllData.TjData2 + AllData.TjData2Unit})` : `` }}
@@ -72,32 +67,26 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
+                AllData.regionGrade == 'three' ||
                 AllData.regionGrade == 'four'
               "
               :data="AllData.chartData2"
               :refresh="AllData.refresh2"
               :ClickData="AllData.ClickData2"
             ></DraBarChartsLeft>
-
-            <DraBarCharts2Y
-              v-if="AllData.regionGrade == 'three'"
-              :data="AllData.chartData1"
-              :refresh="AllData.refresh1"
-              :ClickData="AllData.ClickData1"
-            ></DraBarCharts2Y>
           </div>
         </div>
         <div class="modular3">
           <div class="leve2Title">
             {{
               AllData.regionGrade == "one"
-                ? "河湖排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "two"
-                ? "湖泊排口"
+                ? "污水水量(日)"
                 : AllData.regionGrade == "three"
-                ? "渍水风险点"
+                ? "水量统计(日)"
                 : AllData.regionGrade == "four"
-                ? "历史风险"
+                ? "管网统计"
                 : ""
             }}
             {{ AllData.TjData3 ? `(${AllData.TjData3 + AllData.TjData3Unit})` : `` }}
@@ -107,18 +96,13 @@
               v-if="
                 AllData.regionGrade == 'one' ||
                 AllData.regionGrade == 'two' ||
-                AllData.regionGrade == 'three'
+                AllData.regionGrade == 'three' ||
+                AllData.regionGrade == 'four'
               "
               :data="AllData.chartData3"
               :refresh="AllData.refresh3"
               :ClickData="AllData.ClickData3"
             ></DraBarCharts2Y>
-            <DraLineChartsLeft
-              v-if="AllData.regionGrade == 'four'"
-              :data="AllData.chartData3"
-              :refresh="AllData.refresh3"
-              :ClickData="AllData.ClickData3"
-            />
           </div>
         </div></div
     ></Transition>
@@ -142,12 +126,12 @@
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
             <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
+            <div class="SLList">
               <div class="SlList1P">
                 <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">上游水量</div>
+              <div class="SlList2P">收水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
@@ -156,13 +140,6 @@
               </div>
               <div class="SlList2P">当前站点水量</div>
             </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <span class="SlListNum">{{ AllData.SLFX.downstreamSiteWaterYield }}</span>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">下游水量</div>
-            </div>
           </div>
         </div>
         <div class="modular3_right">
@@ -388,7 +365,6 @@
   ClickData3: "dgtxg",
   GWBD: {},
   SLFX: {},
-  isJBK: true, //是否为接驳口
   chartDataRight: {
     yAxis: [],
     yAxis_Name: "降雨量",
@@ -457,8 +433,8 @@
 
     // 切换时进行数据请求,默认视角请求
     getData1();
+    getData2();
     getData3();
-    getData7();
   }
   if (item.sort == 1) {
     bus.emit("panelDataToMap", {
@@ -513,9 +489,9 @@
     };
 
     // 切换时进行数据请求,默认视角请求
-    getData1();
+    getData2();
+    getData3();
     getData4();
-    getData5();
   }
   if (item.sort == 3) {
     bus.emit("panelDataToMap", {
@@ -530,9 +506,9 @@
       sort: 4,
     };
 
-    getData2();
+    getData3();
+    getData1();
     getData4();
-    getData5();
   }
   if (item.sort == 4) {
     bus.emit("panelDataToMap", {
@@ -571,7 +547,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +556,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +565,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +574,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -628,15 +604,15 @@
         } else if (AllData.regionGrade == "three") {
           // 三级
           console.log("三级");
-          getData1();
+          getData2();
+          getData3();
           getData4();
-          getData5();
         } else if (AllData.regionGrade == "four") {
           // 四级
           console.log("四级");
-          getData2();
+          getData3();
+          getData1();
           getData4();
-          getData5();
         } else {
           // 五级  五级为排水单元,由上可知,因为没有pid 所以此方法无效
           console.log("五级");
@@ -663,14 +639,6 @@
             AllData.GWBD = res.data[0];
           }
         });
-        //   根据type 判断是管井还是接驳口
-        if (Row.properties.type == "rainwater_pipeline_quality_area1") {
-          // 接驳口
-          AllData.isJBK = true;
-        } else {
-          // 管井或其他
-          AllData.isJBK = false;
-        }
         //   上下游水量分析
         getDataSXY(Row.properties);
         //   获取echarts数据
@@ -723,7 +691,7 @@
     sort: 4,
   };
 };
-// 获取数据 徐云欣  一级界面的流域管网/二级界面的管网统计/三级界面的管网统计
+// 获取数据 徐云欣  一级界面的管网统计/二级界面的管网统计/四级界面的管网统计
 const getData1 = () => {
   MonitorAPI.pipelineProblemStatistic({
     regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
@@ -733,7 +701,14 @@
     if (res && res.code == 200) {
       if (AllData.regionGrade == "one") {
         // 一级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
+        AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
@@ -742,288 +717,200 @@
       if (AllData.regionGrade == "two") {
         // 二级Ecahrts 名称
         AllData.chartData2.yAxis_Name = "问题管网";
+        //   数据赋值
+        AllData.chartData2.xAxis = res.data.regionNameList;
+        AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        AllData.chartData2.yAxis2_Name = "总长度";
+        AllData.chartData2.y1_Unit = "km";
+        AllData.refresh2++;
         AllData.TjData2 = res.data.pipelineLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(2);
         AllData.TjData2Unit = "km";
       }
-      if (AllData.regionGrade == "three") {
-        // 三级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
-        AllData.TjData1 = res.data.pipelineLengthList
+      if (AllData.regionGrade == "four") {
+        AllData.chartData3.xAxis = res.data.problemNameList; //X轴数据
+        AllData.chartData3.y1_Unit = "km"; //Y轴单位
+        AllData.chartData3.y2_Unit = ""; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = res.data.pipelineProblemLengthList; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "片区管网问题"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = res.data.pipelineProblemLengthList
           .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(2);
-        AllData.TjData1Unit = "km";
+          .toFixed(0);
+        AllData.TjData3Unit = "km";
+        // // 二级Ecahrts 名称
+        // AllData.chartData2.yAxis_Name = "问题管网";
+        // //   数据赋值
+        // AllData.chartData2.xAxis = res.data.regionNameList;
+        // AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
+        // AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
+        // AllData.chartData2.yAxis2_Name = "总长度";
+        // AllData.chartData2.y1_Unit = "km";
+        // AllData.refresh2++;
+        // AllData.TjData2 = res.data.pipelineLengthList
+        //   .reduce((accu, curren) => Number(accu) + Number(curren))
+        //   .toFixed(2);
+        // AllData.TjData2Unit = "km";
       }
-      //   数据赋值
-      AllData.chartData2.xAxis = res.data.regionNameList;
-      AllData.chartData2.yAxis = res.data.pipelineProblemLengthList;
-      AllData.chartData2.yAxis2 = res.data.pipelineLengthList;
-      AllData.chartData2.yAxis2_Name = "总长度";
-      AllData.chartData2.y1_Unit = "km";
-      AllData.refresh2++;
     }
   });
 };
-
-// 获取数据 徐云欣  二级界面的管网监测/四级界面的历史风险
+// 获取数据 刘芳阳  一级界面的污水水量(日)/二级界面的污水水量(日)/三级界面的水量统计(日)/四级界面的排水量
 const getData2 = () => {
-  MonitorAPI.pipelineRunRiskStatistic({
-    regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
-    regionName: AllData.regionName, //分区名称
-    regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-    // startTime: "", //开始时间（仅历史风险需要用到）
-    // endTime: "", //结束时间（仅历史风险需要用到）
+  MonitorAPI.sewageWaterRegionWaterYieldAnalysis({
+    sewageWaterRegionId: AllData.waterRegionCode ? AllData.waterRegionCode : 0,
   }).then((res) => {
     if (res && res.code == 200) {
+      let XData = []; //片区名称
+      let data1 = []; //站点数
+      let data2 = []; //进水量
+      let data3 = []; //出水量
+      res.data.forEach((element) => {
+        XData.push(element.waterRegionName);
+        data1.push(element.siteNum);
+        data2.push(element.inWaterYield);
+        data3.push(element.outWaterYield);
+      });
+      if (AllData.regionGrade == "one" || AllData.regionGrade == "three") {
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = null; //数据2
+        AllData.chartData3.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
       if (AllData.regionGrade == "two") {
-        AllData.chartData1.xAxis = res.data.regionNameList; //X轴数据
+        AllData.chartData3.xAxis = XData; //X轴数据
+        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
+        AllData.chartData3.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData3.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData3.yAxis1_bar = data2; //数据1
+        AllData.chartData3.yAxis1_bar_Name = "进水量"; //数据1的名称
+        AllData.chartData3.yAxis1_bar_index = 0;
+        AllData.chartData3.yAxis2_bar = data3; //数据2
+        AllData.chartData3.yAxis2_bar_Name = "出水量"; //数据1的名称
+        AllData.chartData3.yAxis2_bar_index = 0;
+        AllData.chartData3.yAxis2_line = null;
+        AllData.chartData3.yAxis2_line_Name = "";
+        AllData.chartData3.yAxis2_line_Index = 1;
+        AllData.chartData3.yAxis3_line = null;
+        AllData.chartData3.yAxis3_line_Name = "";
+        AllData.chartData3.yAxis3_line_Index = 1;
+        AllData.refresh3++;
+        AllData.TjData3 = data2
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData3Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨  一级界面的排水户统计/ 二级界面的排水户统计/ 三级界面的排水户统计
+const getData3 = () => {
+  MonitorAPI.queryDrainageUserInfo({
+    regionId: AllData.waterRegionCode,
+  }).then((res) => {
+    if (res && res.code == 200) {
+      if (
+        AllData.regionGrade == "one" ||
+        AllData.regionGrade == "two" ||
+        AllData.regionGrade == "three"
+      ) {
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = res.data.pipelinePointCount; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageNumber; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "排水户"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = res.data.pipelineRunRiskPointCount; //数据2
-        AllData.chartData1.yAxis2_bar_Name = "运行风险数"; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.keyDrainageNumber; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "重点排水户"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "";
-        AllData.chartData1.yAxis2_line_Index = 0;
+        AllData.chartData1.yAxis2_line = res.data.rtuNumber;
+        AllData.chartData1.yAxis2_line_Name = "监测设备";
+        AllData.chartData1.yAxis2_line_Index = 1;
         AllData.chartData1.yAxis3_line = null;
         AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = res.data.pipelinePointCount
+        AllData.TjData1 = res.data.drainageNumber
           .reduce((accu, curren) => Number(accu) + Number(curren))
           .toFixed(0);
         AllData.TjData1Unit = "个";
       }
       if (AllData.regionGrade == "four") {
-        // AllData.chartData3.xAxis = res.data.regionNameList;
-        // AllData.chartData3.yAxis = res.data.overFlowRiskTimesList; //溢流风险
-        // AllData.chartData3.yAxis2 = res.data.fullPipeTimesList; //满管风险
-        // AllData.chartData3.yAxis_Name = "溢流风险";
-        // AllData.chartData3.yAxis2_Name = "满管风险";
-        // AllData.refresh3++;
-        AllData.chartData3.xAxis = res.data.regionNameList;
-        AllData.chartData3.yAxis1_bar = null;
-        AllData.chartData3.yAxis1_bar_Name = "";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis2_line = res.data.fullPipeTimesList;
-        AllData.chartData3.yAxis2_line_Name = "满管";
-        AllData.chartData3.yAxis2_line_Index = 0;
-        AllData.chartData3.yAxis3_line = res.data.overFlowRiskTimesList;
-        AllData.chartData3.yAxis3_line_Name = "溢流";
-        AllData.chartData3.yAxis3_line_Index = 0;
-        AllData.chartData3.y1_Unit = "次"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-        AllData.TjData3 = null;
-        AllData.TjData3Unit = null;
-      }
-    }
-  });
-};
-
-// 获取数据 谢杨  一级界面的河湖排口/ 二级界面的河湖排口
-const getData3 = () => {
-  MonitorAPI.outletList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.inflowWater;
-        AllData.chartData3.yAxis1_bar_Name = "进水量";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.outletsNumber;
-        AllData.chartData3.yAxis3_line_Name = "排口";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        AllData.refresh3++;
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "two") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.outletsNumber;
-        AllData.chartData3.yAxis1_bar_Name = "排口";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "";
-        AllData.chartData3.yAxis3_line = res.data.inflowWater;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = true;
-        // nextTick(() => {
-        //   debugger;
-        AllData.refresh3++;
-        // }, 1000);
-
-        AllData.TjData3 = res.data.outletsNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢杨  三级界面的渍水风险点/ 四级界面的渍水风险点
-const getData4 = () => {
-  //
-  MonitorAPI.pointList({
-    waterRegionCode: AllData.waterRegionCode, //分区编号
-    // regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "three") {
-        AllData.chartData3.xAxis = res.data.partitionName;
-        AllData.chartData3.yAxis1_bar = res.data.pointNumber;
-        AllData.chartData3.yAxis1_bar_Name = "渍水风险点";
-        AllData.chartData3.yAxis2_bar = null;
-        AllData.chartData3.yAxis2_bar_Name = "风险排口";
-        AllData.chartData3.yAxis3_line = null;
-        AllData.chartData3.yAxis3_line_Name = "进水量";
-        AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "个"; //Y轴单位
-        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_show = false;
-        AllData.refresh3++;
-
-        AllData.TjData3 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData3Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        //
-        AllData.chartData2.xAxis = res.data.partitionName;
-        AllData.chartData2.yAxis = null;
-        AllData.chartData2.yAxis2 = res.data.pointNumber;
-        AllData.chartData2.yAxis2_Name = "数量";
-        AllData.chartData2.yAxis_Name = null;
-        AllData.chartData2.y1_Unit = "个";
-        AllData.refresh2++;
-
-        AllData.TjData2 = res.data.pointNumber
-          .reduce((accu, curren) => Number(accu) + Number(curren))
-          .toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-    }
-  });
-};
-// 获取数据 谢扬 一级界面的河湖水情
-const getData7 = () => {
-  MonitorAPI.queryWaterLevel({}).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        let XData = [];
-        let data1 = []; //当前水位
-        let data2 = []; //设防水位
-        let data3 = []; //调蓄容积
-        res.data.forEach((element) => {
-          XData.push(element.lakeName);
-          data1.push(element.nowWaterlevel);
-          data2.push(element.bestPromitWaterlevel);
-          data3.push(element.volume);
-        });
-        AllData.chartData1.xAxis = XData; //X轴数据
+        AllData.chartData1.xAxis = res.data.partitionName; //X轴数据
         AllData.chartData1.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData1.y2_Unit = "m"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = data3; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "库容量"; //数据1的名称
+        AllData.chartData1.y2_Unit = "个"; //2号Y轴单位
+        AllData.chartData1.y2_show = false; //是否展示右侧的2号轴
+        AllData.chartData1.yAxis1_bar = res.data.drainageVolume; //数据1
+        AllData.chartData1.yAxis1_bar_Name = "可排水量"; //数据1的名称
         AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = data2;
-        AllData.chartData1.yAxis2_line_Name = "控制水位";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = data1;
-        AllData.chartData1.yAxis3_line_Name = "当前水位";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-        AllData.TjData1 = null;
-        AllData.TjData1Unit = null;
-      }
-    }
-  });
-};
-// 获取数据 刘芳阳  / 三级 当日水量分析 /四级当日水量分析
-const getData5 = () => {
-  MonitorAPI.waterRegionWaterYieldAnalysis({
-    waterRegionId: AllData.waterRegionCode,
-  }).then((res) => {
-    if (res && res.code == 200) {
-      let XData = [];
-      let YData1 = [];
-      let YData2 = [];
-      let YData3 = [];
-      res.data.forEach((element) => {
-        XData.push(element.waterRegionName); //X轴数据
-        YData1.push(element.siteNum); //点位数量
-        YData2.push(element.inWaterYield); //进水
-        YData3.push(element.outWaterYield); //出水
-      });
-      if (AllData.regionGrade == "three") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "点位数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
-        AllData.chartData1.yAxis2_bar_index = 0;
-        AllData.chartData1.yAxis2_line = YData2;
-        AllData.chartData1.yAxis2_line_Name = "进水";
-        AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
-        AllData.chartData1.yAxis3_line_Index = 1;
-        AllData.refresh1++;
-
-        AllData.TjData2 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
-        AllData.TjData2Unit = "个";
-      }
-      if (AllData.regionGrade == "four") {
-        AllData.chartData1.xAxis = XData; //X轴数据
-        AllData.chartData1.y1_Unit = "个"; //Y轴单位
-        AllData.chartData1.y2_Unit = "万方"; //2号Y轴单位
-        AllData.chartData1.y2_show = true; //是否展示右侧的2号轴
-        AllData.chartData1.yAxis1_bar = YData1; //数据1
-        AllData.chartData1.yAxis1_bar_Name = "接驳点数"; //数据1的名称
-        AllData.chartData1.yAxis1_bar_index = 0;
-        AllData.chartData1.yAxis2_bar = null; //数据2
-        AllData.chartData1.yAxis2_bar_Name = ""; //数据1的名称
+        AllData.chartData1.yAxis2_bar = res.data.realTimeDrainage; //数据2
+        AllData.chartData1.yAxis2_bar_Name = "实时排水量"; //数据1的名称
         AllData.chartData1.yAxis2_bar_index = 0;
         AllData.chartData1.yAxis2_line = null;
-        AllData.chartData1.yAxis2_line_Name = "进水";
+        AllData.chartData1.yAxis2_line_Name = "";
         AllData.chartData1.yAxis2_line_Index = 1;
-        AllData.chartData1.yAxis3_line = YData3;
-        AllData.chartData1.yAxis3_line_Name = "出水";
+        AllData.chartData1.yAxis3_line = null;
+        AllData.chartData1.yAxis3_line_Name = "";
         AllData.chartData1.yAxis3_line_Index = 1;
         AllData.refresh1++;
-        AllData.TjData1 = YData1.reduce(
-          (accu, curren) => Number(accu) + Number(curren)
-        ).toFixed(0);
+        AllData.TjData1 = res.data.drainageVolume
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(0);
+        AllData.TjData1Unit = "万方";
+      }
+    }
+  });
+};
+//  获取数据 谢杨   三级界面的排水类别/四级界面的排水类别
+const getData4 = () => {
+  MonitorAPI.queryDrainageType({ regionId: AllData.waterRegionCode }).then((res) => {
+    if (res && res.code == 200) {
+      if (AllData.regionGrade == "three" || AllData.regionGrade == "four") {
+        // 三级Ecahrts 名称
+        AllData.chartData2.xAxis = res.data.typeName;
+        AllData.chartData2.yAxis = null;
+        AllData.chartData2.yAxis_Name = "";
+        AllData.chartData2.yAxis2 = res.data.typeNumber;
+        AllData.chartData2.yAxis2_Name = "数量";
+        AllData.chartData2.y1_Unit = "个";
+        AllData.refresh2++;
+        AllData.TjData1 = res.data.typeNumber
+          .reduce((accu, curren) => Number(accu) + Number(curren))
+          .toFixed(2);
         AllData.TjData1Unit = "个";
       }
+      //   数据赋值
     }
   });
 };
@@ -1129,8 +1016,8 @@
     if (!newfiberMap) return;
     bus.on("FenQuClick", FenQuClick);
     getData1();
+    getData2();
     getData3();
-    getData7();
     clearInterval(initeGLTimer);
   }, 100);
 });
@@ -1207,6 +1094,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
+        background-repeat: no-repeat;
+        background-size: contain;
 
         .SlList1P {
           width: 100%;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 51becf8..6532818 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -571,7 +571,7 @@
         res.data.forEach((element) => {
           if (element.grade == "one") {
             AllData.TitleName[1] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "two",
               sort: 1,
@@ -580,7 +580,7 @@
           }
           if (element.grade == "two") {
             AllData.TitleName[2] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "three",
               sort: 2,
@@ -589,7 +589,7 @@
           }
           if (element.grade == "three") {
             AllData.TitleName[3] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "four",
               sort: 3,
@@ -598,7 +598,7 @@
           }
           if (element.grade == "four") {
             AllData.TitleName[4] = {
-              abbreviation: element.shortName,
+              abbreviation: element.shortName ? element.shortName : element.name,
               id: element.id,
               grade: "five",
               sort: 4,
@@ -1207,7 +1207,8 @@
         box-sizing: border-box;
         padding: 15px 0;
         background-image: url("@/assets/images/pictureOnMap/SLFX.png");
-
+        background-repeat: no-repeat;
+        background-size: contain;
         .SlList1P {
           width: 100%;
           height: 40px;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
index 3611592..1749922 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue
@@ -133,6 +133,7 @@
               color: "#AAC1CF",
             },
             splitLine: {
+              show: false,
               lineStyle: {
                 type: "dashed",
                 color: "#2161a8",
@@ -194,12 +195,13 @@
             color: "#AAC1CF",
           },
           splitLine: {
+            show: false,
             lineStyle: {
               type: "dashed",
               color: "#2161a8",
             },
           },
-          alignTicks: true,
+          // alignTicks: true,
           position: "right",
           offset: 0,
         });
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
index b12fa14..3b717cc 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue
@@ -87,7 +87,7 @@
             align: "right",
             fontSize: 10,
           },
-          max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
+          // max: Math.ceil(Math.max.apply(null, props.data.yAxis2) * 1.2),
           nameLocation: "start",
           type: "value",
           minInterval: 1,
@@ -149,7 +149,7 @@
             // },
             data: props.data.yAxis,
             itemStyle: {
-              borderRadius: [20, 20, 20, 20],
+              borderRadius: [0, 20, 20, 0],
               color: "#FF6464",
             },
             label: {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
index 2e07f54..b2b57f4 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
@@ -148,7 +148,7 @@
               },
             },
             nameTextStyle: {
-              color: "#55FFC5",
+              color: "#b14de5",
             },
             splitLine: {
               lineStyle: {
@@ -208,12 +208,12 @@
             symbolSize: 7,
             // 修改折线颜色
             lineStyle: {
-              color: "#55FFC5", // 折线颜色
+              color: "#b14de5", // 折线颜色
               width: 2, // 折线宽度
             },
             // 修改数据点颜色
             itemStyle: {
-              color: "#55FFC5", // 数据点颜色
+              color: "#b14de5", // 数据点颜色
               width: 4,
             },
           },
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
index 0d94a78..aafc8e7 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
@@ -63,6 +63,7 @@
         </div>
       </div>
       
+      
         
     </div>
     <div class="nodata" v-else>
@@ -182,8 +183,19 @@
 <style lang="scss" scoped>
 .MonitoringAlarm {
   height: 100%;
+  :deep(.el-carousel){
+   height: calc(100% - 35px);
+   .el-carousel__container {
+   height: 100%;
+
+   }
+  .el-carousel__indicators {
+    display: none;
+  }
+  }
   .heatingPower {
-   height: calc(100% - 65px);
+  //  height: calc/(100% - 65px);
+   height: 100%;
     overflow-y: auto;
     padding: 30px 15px;
     position: relative;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 127f9d1..58e7308 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -188,7 +188,7 @@
             },
           },
           nameTextStyle: {
-            color: "#55FFC5",
+            color: "#b14de5",
           },
           splitLine: {
             lineStyle: {
@@ -274,12 +274,12 @@
           symbolSize: 7,
           // 修改折线颜色
           lineStyle: {
-            color: "#55FFC5", // 折线颜色
+            color: "#b14de5", // 折线颜色
             width: 2, // 折线宽度
           },
           // 修改数据点颜色
           itemStyle: {
-            color: "#55FFC5", // 数据点颜色
+            color: "#b14de5", // 数据点颜色
             width: 4,
           },
         },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index 1c52b08..6940c5a 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -189,7 +189,7 @@
             },
           },
           nameTextStyle: {
-            color: "#55FFC5",
+            color: "#b14de5",
           },
           splitLine: {
             lineStyle: {
@@ -275,12 +275,12 @@
           symbolSize: 7,
           // 修改折线颜色
           lineStyle: {
-            color: "#55FFC5", // 折线颜色
+            color: "#b14de5", // 折线颜色
             width: 2, // 折线宽度
           },
           // 修改数据点颜色
           itemStyle: {
-            color: "#55FFC5", // 数据点颜色
+            color: "#b14de5", // 数据点颜色
             width: 4,
           },
         },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
index 9b4b37d..98c1ac6 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
@@ -182,7 +182,7 @@
             },
           },
           nameTextStyle: {
-            color: "#55FFC5",
+            color: "#b14de5",
           },
           splitLine: {
             lineStyle: {
@@ -242,12 +242,12 @@
           symbolSize: 7,
           // 修改折线颜色
           lineStyle: {
-            color: "#55FFC5", // 折线颜色
+            color: "#b14de5", // 折线颜色
             width: 2, // 折线宽度
           },
           // 修改数据点颜色
           itemStyle: {
-            color: "#55FFC5", // 数据点颜色
+            color: "#b14de5", // 数据点颜色
             width: 4,
           },
         },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
index cbe4223..aac07a2 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
@@ -190,7 +190,7 @@
             },
           },
           nameTextStyle: {
-            color: "#55FFC5",
+            color: "#b14de5",
           },
           splitLine: {
             lineStyle: {
@@ -276,12 +276,12 @@
           symbolSize: 7,
           // 修改折线颜色
           lineStyle: {
-            color: "#55FFC5", // 折线颜色
+            color: "#b14de5", // 折线颜色
             width: 2, // 折线宽度
           },
           // 修改数据点颜色
           itemStyle: {
-            color: "#55FFC5", // 数据点颜色
+            color: "#b14de5", // 数据点颜色
             width: 4,
           },
         },