diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 8118bec..3b09758 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -937,7 +937,15 @@
       ],
       "paint": {
         "fill-color": ["get", "color"],
-        "fill-opacity": 0.3
+        "fill-opacity": [
+          "match",
+          ["get", "level"],
+          "1",0.5,
+          "2",0.15,
+          "3",0.10,
+          "4",0.05,
+          0.5
+        ]
       },
       "minzoom": 7,
       "maxzoom": 24,

diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 8118bec..3b09758 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -937,7 +937,15 @@
       ],
       "paint": {
         "fill-color": ["get", "color"],
-        "fill-opacity": 0.3
+        "fill-opacity": [
+          "match",
+          ["get", "level"],
+          "1",0.5,
+          "2",0.15,
+          "3",0.10,
+          "4",0.05,
+          0.5
+        ]
       },
       "minzoom": 7,
       "maxzoom": 24,
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 809a38c..8a4aef5 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -132,13 +132,14 @@
     proxy.$emit("map-click1", lngLat, properties, layerId);
     const { town, hupo, gangqu, hb_wh_dhgx_merge,psfq,point } = default_params;
     const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
-    const _keys = ["rain_water_pump_station_info", "sewage_pump_station_info",'rainwater_pipeline_quality_area1',point.children.outlet_info2.key];
+    const _keys = ["rain_water_pump_station_info", "sewage_pump_station_info",'rainwater_pipeline_quality_area1'];
 
     (() => {
       setHighlight_(properties);
       ysFlow();
       newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection([]));
       busEmit(removeMapDatas.key, _keys.map((k) => k + 1));
+
       if (town.prevId) {
         busEmit(setLayerVisible.key, { layername: town.key, isCheck: true });
         busEmit(setLayerVisible.key, { layername: town.prevId, isCheck: false });
@@ -146,9 +147,7 @@
       }
 
       if (psfq.prevIds.length &&  !([psfq.key,point.key].includes(layerId))) {
-        debugger;
         districtMask();
-        console.log('psfq.prevIds',psfq.prevIds);
         const isOne = psfq.prevIds.length == 1?1:2
         let properties = psfq.prevIds[psfq.prevIds.length -1];
         areaToMap(properties);

diff --git a/public/static/libs/mapbox/style/wh_dhgx.json b/public/static/libs/mapbox/style/wh_dhgx.json
index 8118bec..3b09758 100644
--- a/public/static/libs/mapbox/style/wh_dhgx.json
+++ b/public/static/libs/mapbox/style/wh_dhgx.json
@@ -937,7 +937,15 @@
       ],
       "paint": {
         "fill-color": ["get", "color"],
-        "fill-opacity": 0.3
+        "fill-opacity": [
+          "match",
+          ["get", "level"],
+          "1",0.5,
+          "2",0.15,
+          "3",0.10,
+          "4",0.05,
+          0.5
+        ]
       },
       "minzoom": 7,
       "maxzoom": 24,
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 809a38c..8a4aef5 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -132,13 +132,14 @@
     proxy.$emit("map-click1", lngLat, properties, layerId);
     const { town, hupo, gangqu, hb_wh_dhgx_merge,psfq,point } = default_params;
     const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
-    const _keys = ["rain_water_pump_station_info", "sewage_pump_station_info",'rainwater_pipeline_quality_area1',point.children.outlet_info2.key];
+    const _keys = ["rain_water_pump_station_info", "sewage_pump_station_info",'rainwater_pipeline_quality_area1'];
 
     (() => {
       setHighlight_(properties);
       ysFlow();
       newfiberMap.getLayers().filter((i) => i.newfiberId == "村域边界")[0].setData(turf.featureCollection([]));
       busEmit(removeMapDatas.key, _keys.map((k) => k + 1));
+
       if (town.prevId) {
         busEmit(setLayerVisible.key, { layername: town.key, isCheck: true });
         busEmit(setLayerVisible.key, { layername: town.prevId, isCheck: false });
@@ -146,9 +147,7 @@
       }
 
       if (psfq.prevIds.length &&  !([psfq.key,point.key].includes(layerId))) {
-        debugger;
         districtMask();
-        console.log('psfq.prevIds',psfq.prevIds);
         const isOne = psfq.prevIds.length == 1?1:2
         let properties = psfq.prevIds[psfq.prevIds.length -1];
         areaToMap(properties);
diff --git a/src/views/pictureOnMap/page/DrainageSystem/index.vue b/src/views/pictureOnMap/page/DrainageSystem/index.vue
index a6c024c..ae7b860 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/index.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/index.vue
@@ -19,6 +19,7 @@
 <script setup name="DrainageSystem">
   import {ref, reactive, toRefs, onMounted, onBeforeUnmount} from "vue";
 import bus from "@/bus";
+  import YSIndex from "./YSIndex.vue";
 // 引入接口
 import * as MonitorAPI from "@/api/MonitoringAnalysis.js";
 // 引入echarts组件
@@ -35,10 +36,6 @@
   showPanel.value = val;
 };
 
-=======
-import { ref, reactive, toRefs, onMounted } from "vue";
-import YSIndex from "./YSIndex.vue";
->>>>>>> e667c948d24ce7ebd6d93760b5f869c8372212a5
 const AllData = reactive({
   yw_type: [
     { name: "污水体系", key: "sewage",
@@ -61,13 +58,8 @@
 });
 
 const TypeClick = (item) => {
-  let type = item.key;
-  TypeClick_();
-  AllData.regionGrade = "one";
-  AllData.regionName = "";
-  newfiberMap.map.easeTo(newfiberMap.config_.params.init);
-  // 切换时回到默认一级分区
-  AllData.TypeID = type;
+  TypeClick_(item);
+  AllData.TypeID = item.key;
 };
 const TypeClick_ = (item)=>{
   closeAllLayer();
@@ -86,122 +78,18 @@
   AllData.yw_type.map((i) => i.values).filter(Boolean).flat().forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: false,values:i.values }));
   bus.emit(setHighlight.key, []);
 };
-// 清除面包屑的数据
-const clearMianBaoData = () => {
-  AllData.TitleName[1] = {
-    abbreviation: "",
-    Name: "",
-    id: "",
-    grade: "two",
-    sort: 1,
-  };
-  AllData.TitleName[2] = {
-    abbreviation: "",
-    Name: "",
-    id: "",
-    grade: "three",
-    sort: 2,
-  };
-  AllData.TitleName[3] = {
-    abbreviation: "",
-    Name: "",
-    id: "",
-    grade: "four",
-    sort: 3,
-  };
-  AllData.TitleName[4] = {
-    abbreviation: "",
-    Name: "",
-    id: "",
-    grade: "five",
-    sort: 4,
-  };
-};
-// 获取数据  一级界面的流域管网/二级界面的管网统计/三级界面的管网统计
-const getData1 = () => {
-  MonitorAPI.pipelineProblemStatistic({
-    regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
-    regionName: AllData.regionName, //分区名称
-    regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "one") {
-        // 一级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "摸排管网";
-      }
-      if (AllData.regionGrade == "two") {
-        // 二级Ecahrts 名称
-        AllData.chartData2.yAxis_Name = "问题管网";
-      }
-      if (AllData.regionGrade == "three") {
-        // 三级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.refresh2++;
-    }
-  });
-};
 
-// 获取数据  二级界面的管网监测/四级界面的历史风险
-const getData2 = () => {
-  MonitorAPI.pipelineRunRiskStatistic({
-    regionGrade: AllData.regionGrade, //分区级别（one：一级 || two：二级 || three：三级 || four：四级 || five：五级）
-    regionName: AllData.regionName, //分区名称
-    regionType: AllData.TypeID, //分区类型（sewage：污水 || rain：雨水）
-    // startTime: "", //开始时间（仅历史风险需要用到）
-    // endTime: "", //结束时间（仅历史风险需要用到）
-  }).then((res) => {
-    if (res && res.code == 200) {
-      if (AllData.regionGrade == "two") {
-        AllData.chartData1.xAxis = res.data.regionNameList;
-        AllData.chartData1.yAxis = res.data.pipelinePointCount; //运行风险点位数
-        AllData.chartData1.yAxis2 = res.data.pipelineRunRiskPointCount; //管网监测点位数
-        AllData.chartData1.yAxis_Name = "运行风险数";
-        AllData.chartData1.yAxis2_Name = "点位数";
-        AllData.refresh1++;
-      }
-      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++;
-      }
-    }
-  });
-};
 onMounted(() => {
-  let initeGLTimer = setInterval(() => {
-    if (!newfiberMap) return;
-    TypeClick(AllData.yw_type[1]);
-    bus.on("FenQuClick", FenQuClick);
-    // bus.on("openJXFXDialog", openJXFXDialog);
-    clearInterval(initeGLTimer);
-  }, 100);
 
-  bus.on(mapInitBusName, () => TypeClick(AllData.yw_type[0]);
+  bus.on(mapInitBusName, () => TypeClick(AllData.yw_type.filter((i) => i.key == AllData.TypeID)[0]));
 });
 
-  onBeforeUnmount(() => {
-    bus.off("FenQuClick");
-    bus.off("openJXFXDialog");
-    bus.off(mapInitBusName);
-    closeAllLayer();
-  });
-=======
-  AllData.TypeID = item.key;
-};
-
-onMounted(() => {});
-
-onBeforeUnmount(() => {});
->>>>>>> e667c948d24ce7ebd6d93760b5f869c8372212a5
+onBeforeUnmount(() => {
+  bus.off("FenQuClick");
+  bus.off("openJXFXDialog");
+  bus.off(mapInitBusName);
+  closeAllLayer();
+});
 </script>
 
 <style lang="scss" scoped>