diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index bdaf63a..3923764 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -12,14 +12,18 @@
     permissions: [],
     MapData: [],
     MapDataCount: [],
+    TiXiType: ''
   }),
   actions: {
     SET_MapData(MapData) {
       this.MapData = MapData;
     },
-      SET_MapData_COUNT(count){
-          this.MapDataCount = count;
-      },
+    SET_MapData_COUNT(count) {
+      this.MapDataCount = count;
+    },
+    Set_TiXiType(data) {
+      this.TiXiType = data
+    },
     // 登录
     login(userInfo) {
       const username = userInfo.username.trim();

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index bdaf63a..3923764 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -12,14 +12,18 @@
     permissions: [],
     MapData: [],
     MapDataCount: [],
+    TiXiType: ''
   }),
   actions: {
     SET_MapData(MapData) {
       this.MapData = MapData;
     },
-      SET_MapData_COUNT(count){
-          this.MapDataCount = count;
-      },
+    SET_MapData_COUNT(count) {
+      this.MapDataCount = count;
+    },
+    Set_TiXiType(data) {
+      this.TiXiType = data
+    },
     // 登录
     login(userInfo) {
       const username = userInfo.username.trim();
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 7b8cfab..99a5a56 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -411,41 +411,49 @@
   // 对 delay 进行判断，如果传递的是 null 则不需要使用 节流方案，直接返回使用 ref 创建的。
   return delay == null
     ? // 返回 ref 创建的
-      ref(data)
+    ref(data)
     : // customRef 中会返回两个函数参数。一个是：track 在获取数据时收集依赖的；一个是：trigger 在修改数据时进行通知派发更新的。
-      customRef((track, trigger) => {
-        return {
-          get() {
-            // 收集依赖
-            track();
-            // 返回当前数据的值
-            return data;
-          },
-          set(value) {
-            // 判断
-            if (timer == null) {
-              // 创建定时器
-              timer = setTimeout(() => {
-                // 修改数据
-                data = value;
-                // 派发更新
-                trigger();
-                // 清除定时器
-                clearTimeout(timer);
-                timer = null;
-              }, delay);
-            }
-          },
-        };
-      });
+    customRef((track, trigger) => {
+      return {
+        get() {
+          // 收集依赖
+          track();
+          // 返回当前数据的值
+          return data;
+        },
+        set(value) {
+          // 判断
+          if (timer == null) {
+            // 创建定时器
+            timer = setTimeout(() => {
+              // 修改数据
+              data = value;
+              // 派发更新
+              trigger();
+              // 清除定时器
+              clearTimeout(timer);
+              timer = null;
+            }, delay);
+          }
+        },
+      };
+    });
 };
 // 查找匹配对应的obj
 export const findDictObj2 = (dic, target, value) => {
   for (let i = 0; i < dic.length; i++) {
-      let id = dic[i][target];
-      if (id == value) {
-          return dic[i];
-      }
+    let id = dic[i][target];
+    if (id == value) {
+      return dic[i];
+    }
   }
   return {};
-};
\ No newline at end of file
+};
+// // 根据状态判断当前
+// export function getShow(str) {
+//   let bol = false;
+//   if (str == TXtYPE.value) {
+//     bol = true;
+//   }
+//   return bol;
+// };

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index bdaf63a..3923764 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -12,14 +12,18 @@
     permissions: [],
     MapData: [],
     MapDataCount: [],
+    TiXiType: ''
   }),
   actions: {
     SET_MapData(MapData) {
       this.MapData = MapData;
     },
-      SET_MapData_COUNT(count){
-          this.MapDataCount = count;
-      },
+    SET_MapData_COUNT(count) {
+      this.MapDataCount = count;
+    },
+    Set_TiXiType(data) {
+      this.TiXiType = data
+    },
     // 登录
     login(userInfo) {
       const username = userInfo.username.trim();
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 7b8cfab..99a5a56 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -411,41 +411,49 @@
   // 对 delay 进行判断，如果传递的是 null 则不需要使用 节流方案，直接返回使用 ref 创建的。
   return delay == null
     ? // 返回 ref 创建的
-      ref(data)
+    ref(data)
     : // customRef 中会返回两个函数参数。一个是：track 在获取数据时收集依赖的；一个是：trigger 在修改数据时进行通知派发更新的。
-      customRef((track, trigger) => {
-        return {
-          get() {
-            // 收集依赖
-            track();
-            // 返回当前数据的值
-            return data;
-          },
-          set(value) {
-            // 判断
-            if (timer == null) {
-              // 创建定时器
-              timer = setTimeout(() => {
-                // 修改数据
-                data = value;
-                // 派发更新
-                trigger();
-                // 清除定时器
-                clearTimeout(timer);
-                timer = null;
-              }, delay);
-            }
-          },
-        };
-      });
+    customRef((track, trigger) => {
+      return {
+        get() {
+          // 收集依赖
+          track();
+          // 返回当前数据的值
+          return data;
+        },
+        set(value) {
+          // 判断
+          if (timer == null) {
+            // 创建定时器
+            timer = setTimeout(() => {
+              // 修改数据
+              data = value;
+              // 派发更新
+              trigger();
+              // 清除定时器
+              clearTimeout(timer);
+              timer = null;
+            }, delay);
+          }
+        },
+      };
+    });
 };
 // 查找匹配对应的obj
 export const findDictObj2 = (dic, target, value) => {
   for (let i = 0; i < dic.length; i++) {
-      let id = dic[i][target];
-      if (id == value) {
-          return dic[i];
-      }
+    let id = dic[i][target];
+    if (id == value) {
+      return dic[i];
+    }
   }
   return {};
-};
\ No newline at end of file
+};
+// // 根据状态判断当前
+// export function getShow(str) {
+//   let bol = false;
+//   if (str == TXtYPE.value) {
+//     bol = true;
+//   }
+//   return bol;
+// };
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index e51ed00..3bc3b6e 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="layerControlvue" v-show="Show">
-    <div class="layericon" @click="allData.showControlBox = !allData.showControlBox"></div>
+    <div
+      class="layericon"
+      @click="allData.showControlBox = !allData.showControlBox"
+    ></div>
 
     <div class="LayerControlBox" v-show="allData.showControlBox">
       <div class="ControlBox-body">
@@ -12,6 +15,7 @@
           node-key="value"
           default-expand-all
           :expand-on-click-node="false"
+          :filter-node-method="filterTX"
           @check="check"
         >
           <template #default="{ node, data }">
@@ -26,99 +30,109 @@
   </div>
 </template>
 <script setup>
-import bus from '@/bus/';
-import useUserStore from '@/store/modules/user';
+import bus from "@/bus/";
+import useUserStore from "@/store/modules/user";
 const appStore = useUserStore();
 
-import { getImageUrl } from '@/utils/ruoyi';
-import { nextTick } from 'vue';
+import { getImageUrl } from "@/utils/ruoyi";
+import { nextTick } from "vue";
 const { proxy } = getCurrentInstance();
 const Show = ref(true);
 const selectList = ref([]);
+const TXtYPE = ref("");
 const dataSource = ref([
   {
-    value: '地图切换',
-    label: '地图切换',
-    class: 'target-class',
+    value: "地图切换",
+    label: "地图切换",
+    class: "target-class",
     children: [
       {
-        value: 'newfiber-XYZLayer,高清地图',
-        label: '影像地图',
-        icon: getImageUrl('maptwo.png', 'images/NewLayercontrol'),
+        value: "newfiber-XYZLayer,高清地图",
+        label: "影像地图",
+        icon: getImageUrl("maptwo.png", "images/NewLayercontrol"),
+        // VShow: true,
       },
     ],
   },
   {
-    value: '排水体系',
-    label: '排水体系',
-    class: 'target-class',
+    value: "排水体系",
+    label: "排水体系",
+    class: "target-class",
     children: [
       {
-        value: '雨水分区',
-        label: '雨水系统',
-        icon: getImageUrl('yuliangzhan.png', 'images/NewLayercontrol'),
+        value: "雨水分区",
+        label: "雨水系统",
+        icon: getImageUrl("yuliangzhan.png", "images/NewLayercontrol"),
+        VShow: "sewage",
       },
       {
-        value: '污水分区',
-        label: '污水系统',
-        icon: getImageUrl('zishuidian.png', 'images/NewLayercontrol'),
+        value: "污水分区",
+        label: "污水系统",
+        icon: getImageUrl("zishuidian.png", "images/NewLayercontrol"),
+        VShow: "rain",
       },
       {
-        value: '尾水路径',
-        label: '尾水路径',
-        icon: getImageUrl('尾水路径.png', 'images/NewLayercontrol'),
+        value: "尾水路径",
+        label: "尾水路径",
+        icon: getImageUrl("尾水路径.png", "images/NewLayercontrol"),
       },
       {
-        value: 'sewage_pump_station_info',
-        icon: getImageUrl('wushuibengzhan.png', 'images/NewLayercontrol'),
-        label: '污水泵站',
+        value: "sewage_pump_station_info",
+        icon: getImageUrl("wushuibengzhan.png", "images/NewLayercontrol"),
+        label: "污水泵站",
+        VShow: "rain",
       },
       {
-        value: 'sewage_factory_info',
-        icon: getImageUrl('wushuichulichang.png', 'images/NewLayercontrol'),
-        label: '污水厂',
+        value: "sewage_factory_info",
+        icon: getImageUrl("wushuichulichang.png", "images/NewLayercontrol"),
+        label: "污水厂",
+        VShow: "rain",
       },
       {
-        label: '污水处理站',
-        value: 'sewage_factory_station_info',
-        icon: getImageUrl('wushuichulizhan.png', 'images/NewLayercontrol'),
+        label: "污水处理站",
+        value: "sewage_factory_station_info",
+        icon: getImageUrl("wushuichulizhan.png", "images/NewLayercontrol"),
+        VShow: "rain",
       },
       {
-        value: 'rain_water_pump_station_info',
-        icon: getImageUrl('yushuibengzhan.png', 'images/NewLayercontrol'),
-        label: '雨水泵站',
+        value: "rain_water_pump_station_info",
+        icon: getImageUrl("yushuibengzhan.png", "images/NewLayercontrol"),
+        label: "雨水泵站",
+        VShow: "sewage",
       },
       {
-        value: 'water_gate_info',
-        icon: getImageUrl('shuizha.png', 'images/NewLayercontrol'),
-        label: '水闸',
+        value: "water_gate_info",
+        icon: getImageUrl("shuizha.png", "images/NewLayercontrol"),
+        label: "水闸",
       },
       {
-        value: 'storage_tank_info',
-        icon: getImageUrl('tiaoxuchi.png', 'images/NewLayercontrol'),
-        label: '调蓄池',
+        value: "storage_tank_info",
+        icon: getImageUrl("tiaoxuchi.png", "images/NewLayercontrol"),
+        label: "调蓄池",
       },
       {
-        label: '分流井',
-        value: 'diversion_well_info',
-        icon: getImageUrl('feliujin.png', 'images/NewLayercontrol'),
+        label: "分流井",
+        value: "diversion_well_info",
+        icon: getImageUrl("feliujin.png", "images/NewLayercontrol"),
       },
     ],
   },
   {
-    value: '管网',
-    label: '管网',
-    class: 'target-class',
+    value: "管网",
+    label: "管网",
+    class: "target-class",
     children: [
       {
-        value: '雨水管网',
-        label: '雨水管网',
-        icon: getImageUrl('lay-yushuiguanwang.png', 'images/NewLayercontrol'),
+        value: "雨水管网",
+        label: "雨水管网",
+        icon: getImageUrl("lay-yushuiguanwang.png", "images/NewLayercontrol"),
+        VShow: "sewage",
       },
       {
-        value: '污水管网',
-        label: '污水管网',
-        icon: getImageUrl('lay-wushuiguanwang.png', 'images/NewLayercontrol'),
+        value: "污水管网",
+        label: "污水管网",
+        icon: getImageUrl("lay-wushuiguanwang.png", "images/NewLayercontrol"),
+        VShow: "rain",
       },
     ],
   },
@@ -140,52 +154,55 @@
     ],
   },*/
   {
-    value: '监测点',
-    label: '监测点',
-    class: 'target-class',
+    value: "监测点",
+    label: "监测点",
+    class: "target-class",
     children: [
       {
-        value: 'rainwater_pipeline_quality_area',
-        label: '社区雨水接驳口',
+        value: "rainwater_pipeline_quality_area",
+        label: "社区雨水接驳口",
+        VShow: "sewage",
       },
       {
-        value: 'rainwater_pipeline_quality_city',
-        label: '市政雨水监测',
+        value: "rainwater_pipeline_quality_city",
+        label: "市政雨水监测",
+        VShow: "sewage",
       },
       {
-        value: 'sewage_pipeline_quality_city',
-        label: '市政污水监测',
+        value: "sewage_pipeline_quality_city",
+        label: "市政污水监测",
+        VShow: "rain",
       },
       {
-        value: 'outlet_quality',
-        label: '排口水质',
+        value: "outlet_quality",
+        label: "排口水质",
       },
       {
-        value: 'outlet_water_level',
-        label: '排口流量',
+        value: "outlet_water_level",
+        label: "排口流量",
       },
     ],
   },
   {
-    value: '其他',
-    label: '其他',
-    class: 'target-class',
+    value: "其他",
+    label: "其他",
+    class: "target-class",
     children: [
       {
-        value: 'drainage_info',
-        label: '排水户',
+        value: "drainage_info",
+        label: "排水户",
       },
       {
-        value: '港渠',
-        label: '港渠',
+        value: "港渠",
+        label: "港渠",
       },
       {
-        value: 'outlet_info',
-        label: '排口',
+        value: "outlet_info",
+        label: "排口",
       },
       {
-        value: '建筑物',
-        label: '建筑物',
+        value: "建筑物",
+        label: "建筑物",
       },
     ],
   },
@@ -201,7 +218,7 @@
   selectList.value = [];
   if (node) {
     let arr = [...node.checkedNodes];
-    arr.map(item => {
+    arr.map((item) => {
       if (item.value) {
         selectList.value.push(item.value);
       }
@@ -227,46 +244,48 @@
 
   openLayer.length &&
     openLayer
-      .map(i => i.split(','))
+      .map((i) => i.split(","))
       .flat(Infinity)
-      .forEach(key =>
-        bus.emit('setLayerVisible', {
+      .forEach((key) =>
+        bus.emit("setLayerVisible", {
           layername: key,
-          isCheck: key.includes('!') ? false : true,
+          isCheck: key.includes("!") ? false : true,
         })
       );
   closeLayer.length &&
     closeLayer
-      .map(i => i.split(','))
+      .map((i) => i.split(","))
       .flat(Infinity)
-      .forEach(key =>
-        bus.emit('setLayerVisible', {
+      .forEach((key) =>
+        bus.emit("setLayerVisible", {
           layername: key,
-          isCheck: key.includes('!') ? true : false,
+          isCheck: key.includes("!") ? true : false,
         })
       );
   // newfiberMap.map.triggerRepaint();
 }
 
 function changeyangshi() {
-  const targetElements = document.querySelectorAll('.target-class');
-  targetElements.forEach(target => {
+  const targetElements = document.querySelectorAll(".target-class");
+  targetElements.forEach((target) => {
     const parent = target.parentElement; // 获取父级元素
     // console.log('parent', parent);
     if (parent) {
-      parent.classList.add('mycustomclass');
+      parent.classList.add("mycustomclass");
       // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
       // 你可以在这里设置父级元素的其他样式
     }
   });
 }
-
+function filterTX(value, data, node) {
+  console.log("12121", value, data, node);
+}
 onMounted(() => {
   nextTick(() => {
     changeyangshi();
   });
-  bus.on('YQ_head', val => {
-    console.log('valvalvalval', val);
+  bus.on("YQ_head", (val) => {
+    console.log("valvalvalval", val);
     if (val == false) {
       Show.value = false;
     } else {
@@ -276,20 +295,30 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off('YQ_head');
+  bus.off("YQ_head");
 });
 
 function reset() {
   proxy.$refs.layertree.setCheckedKeys([]);
   selectList.value = [];
-  bus.emit('clearTemporaryData');
+  bus.emit("clearTemporaryData");
   bus.emit(mapInitBusName);
 }
 
 watch(
   () => appStore.MapDataCount,
   (newValue, oldValue) => {
-    dataSource.value.forEach(i => i.children.forEach(k => (k.n = newValue[k.value])));
+    dataSource.value.forEach((i) => i.children.forEach((k) => (k.n = newValue[k.value])));
+  },
+  { deep: true, once: true }
+);
+watch(
+  () => appStore.TiXiType,
+  (newValue, oldValue) => {
+    TXtYPE.value = newValue;
+    console.log("图层控制中的雨污水状态", TXtYPE.value);
+    dataSource.value = JSON.parse(JSON.stringify(dataSource.value));
+    console.log(dataSource.value);
   },
   { deep: true, once: true }
 );
@@ -346,7 +375,11 @@
 
   .mycustomclass {
     position: relative;
-    background: linear-gradient(90deg, rgba(50, 146, 255, 0.5) 0%, rgba(12, 125, 255, 0.2) 100%) !important;
+    background: linear-gradient(
+      90deg,
+      rgba(50, 146, 255, 0.5) 0%,
+      rgba(12, 125, 255, 0.2) 100%
+    ) !important;
     border-left: 4px solid #048cff;
     .el-checkbox {
       display: none;
@@ -362,7 +395,7 @@
   height: 40px;
   left: 487px;
   top: 128px;
-  background: url('@/assets/images/NewLayercontrol/layerIcon.png') no-repeat;
+  background: url("@/assets/images/NewLayercontrol/layerIcon.png") no-repeat;
   background-size: 100% 100%;
 }
 
@@ -372,7 +405,7 @@
   left: 500px;
   top: 175px;
   padding: 10px;
-  background: url('@/assets/images/NewLayercontrol/layerBg.png') no-repeat;
+  background: url("@/assets/images/NewLayercontrol/layerBg.png") no-repeat;
   background-size: 100% 100%;
   width: 200px !important;
   height: auto;
@@ -409,7 +442,11 @@
       font-family: Source Han Sans CN;
       font-weight: 500;
       color: #839ecb;
-      background: linear-gradient(0deg, rgba(27, 161, 255, 0.2) 0%, rgba(27, 161, 255, 0.1) 100%);
+      background: linear-gradient(
+        0deg,
+        rgba(27, 161, 255, 0.2) 0%,
+        rgba(27, 161, 255, 0.1) 100%
+      );
       border-radius: 12px;
       text-align: center;
     }
@@ -460,7 +497,11 @@
   left: 50%;
   transform: translateX(-50%);
   width: 60%;
-  background: linear-gradient(0deg, rgba(4, 140, 255, 0.5) 0%, rgba(4, 140, 255, 0.3) 100%);
+  background: linear-gradient(
+    0deg,
+    rgba(4, 140, 255, 0.5) 0%,
+    rgba(4, 140, 255, 0.3) 100%
+  );
   border-radius: 13px;
   border: 1px solid #2199ff;
   text-align: center;

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index bdaf63a..3923764 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -12,14 +12,18 @@
     permissions: [],
     MapData: [],
     MapDataCount: [],
+    TiXiType: ''
   }),
   actions: {
     SET_MapData(MapData) {
       this.MapData = MapData;
     },
-      SET_MapData_COUNT(count){
-          this.MapDataCount = count;
-      },
+    SET_MapData_COUNT(count) {
+      this.MapDataCount = count;
+    },
+    Set_TiXiType(data) {
+      this.TiXiType = data
+    },
     // 登录
     login(userInfo) {
       const username = userInfo.username.trim();
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 7b8cfab..99a5a56 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -411,41 +411,49 @@
   // 对 delay 进行判断，如果传递的是 null 则不需要使用 节流方案，直接返回使用 ref 创建的。
   return delay == null
     ? // 返回 ref 创建的
-      ref(data)
+    ref(data)
     : // customRef 中会返回两个函数参数。一个是：track 在获取数据时收集依赖的；一个是：trigger 在修改数据时进行通知派发更新的。
-      customRef((track, trigger) => {
-        return {
-          get() {
-            // 收集依赖
-            track();
-            // 返回当前数据的值
-            return data;
-          },
-          set(value) {
-            // 判断
-            if (timer == null) {
-              // 创建定时器
-              timer = setTimeout(() => {
-                // 修改数据
-                data = value;
-                // 派发更新
-                trigger();
-                // 清除定时器
-                clearTimeout(timer);
-                timer = null;
-              }, delay);
-            }
-          },
-        };
-      });
+    customRef((track, trigger) => {
+      return {
+        get() {
+          // 收集依赖
+          track();
+          // 返回当前数据的值
+          return data;
+        },
+        set(value) {
+          // 判断
+          if (timer == null) {
+            // 创建定时器
+            timer = setTimeout(() => {
+              // 修改数据
+              data = value;
+              // 派发更新
+              trigger();
+              // 清除定时器
+              clearTimeout(timer);
+              timer = null;
+            }, delay);
+          }
+        },
+      };
+    });
 };
 // 查找匹配对应的obj
 export const findDictObj2 = (dic, target, value) => {
   for (let i = 0; i < dic.length; i++) {
-      let id = dic[i][target];
-      if (id == value) {
-          return dic[i];
-      }
+    let id = dic[i][target];
+    if (id == value) {
+      return dic[i];
+    }
   }
   return {};
-};
\ No newline at end of file
+};
+// // 根据状态判断当前
+// export function getShow(str) {
+//   let bol = false;
+//   if (str == TXtYPE.value) {
+//     bol = true;
+//   }
+//   return bol;
+// };
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index e51ed00..3bc3b6e 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="layerControlvue" v-show="Show">
-    <div class="layericon" @click="allData.showControlBox = !allData.showControlBox"></div>
+    <div
+      class="layericon"
+      @click="allData.showControlBox = !allData.showControlBox"
+    ></div>
 
     <div class="LayerControlBox" v-show="allData.showControlBox">
       <div class="ControlBox-body">
@@ -12,6 +15,7 @@
           node-key="value"
           default-expand-all
           :expand-on-click-node="false"
+          :filter-node-method="filterTX"
           @check="check"
         >
           <template #default="{ node, data }">
@@ -26,99 +30,109 @@
   </div>
 </template>
 <script setup>
-import bus from '@/bus/';
-import useUserStore from '@/store/modules/user';
+import bus from "@/bus/";
+import useUserStore from "@/store/modules/user";
 const appStore = useUserStore();
 
-import { getImageUrl } from '@/utils/ruoyi';
-import { nextTick } from 'vue';
+import { getImageUrl } from "@/utils/ruoyi";
+import { nextTick } from "vue";
 const { proxy } = getCurrentInstance();
 const Show = ref(true);
 const selectList = ref([]);
+const TXtYPE = ref("");
 const dataSource = ref([
   {
-    value: '地图切换',
-    label: '地图切换',
-    class: 'target-class',
+    value: "地图切换",
+    label: "地图切换",
+    class: "target-class",
     children: [
       {
-        value: 'newfiber-XYZLayer,高清地图',
-        label: '影像地图',
-        icon: getImageUrl('maptwo.png', 'images/NewLayercontrol'),
+        value: "newfiber-XYZLayer,高清地图",
+        label: "影像地图",
+        icon: getImageUrl("maptwo.png", "images/NewLayercontrol"),
+        // VShow: true,
       },
     ],
   },
   {
-    value: '排水体系',
-    label: '排水体系',
-    class: 'target-class',
+    value: "排水体系",
+    label: "排水体系",
+    class: "target-class",
     children: [
       {
-        value: '雨水分区',
-        label: '雨水系统',
-        icon: getImageUrl('yuliangzhan.png', 'images/NewLayercontrol'),
+        value: "雨水分区",
+        label: "雨水系统",
+        icon: getImageUrl("yuliangzhan.png", "images/NewLayercontrol"),
+        VShow: "sewage",
       },
       {
-        value: '污水分区',
-        label: '污水系统',
-        icon: getImageUrl('zishuidian.png', 'images/NewLayercontrol'),
+        value: "污水分区",
+        label: "污水系统",
+        icon: getImageUrl("zishuidian.png", "images/NewLayercontrol"),
+        VShow: "rain",
       },
       {
-        value: '尾水路径',
-        label: '尾水路径',
-        icon: getImageUrl('尾水路径.png', 'images/NewLayercontrol'),
+        value: "尾水路径",
+        label: "尾水路径",
+        icon: getImageUrl("尾水路径.png", "images/NewLayercontrol"),
       },
       {
-        value: 'sewage_pump_station_info',
-        icon: getImageUrl('wushuibengzhan.png', 'images/NewLayercontrol'),
-        label: '污水泵站',
+        value: "sewage_pump_station_info",
+        icon: getImageUrl("wushuibengzhan.png", "images/NewLayercontrol"),
+        label: "污水泵站",
+        VShow: "rain",
       },
       {
-        value: 'sewage_factory_info',
-        icon: getImageUrl('wushuichulichang.png', 'images/NewLayercontrol'),
-        label: '污水厂',
+        value: "sewage_factory_info",
+        icon: getImageUrl("wushuichulichang.png", "images/NewLayercontrol"),
+        label: "污水厂",
+        VShow: "rain",
       },
       {
-        label: '污水处理站',
-        value: 'sewage_factory_station_info',
-        icon: getImageUrl('wushuichulizhan.png', 'images/NewLayercontrol'),
+        label: "污水处理站",
+        value: "sewage_factory_station_info",
+        icon: getImageUrl("wushuichulizhan.png", "images/NewLayercontrol"),
+        VShow: "rain",
       },
       {
-        value: 'rain_water_pump_station_info',
-        icon: getImageUrl('yushuibengzhan.png', 'images/NewLayercontrol'),
-        label: '雨水泵站',
+        value: "rain_water_pump_station_info",
+        icon: getImageUrl("yushuibengzhan.png", "images/NewLayercontrol"),
+        label: "雨水泵站",
+        VShow: "sewage",
       },
       {
-        value: 'water_gate_info',
-        icon: getImageUrl('shuizha.png', 'images/NewLayercontrol'),
-        label: '水闸',
+        value: "water_gate_info",
+        icon: getImageUrl("shuizha.png", "images/NewLayercontrol"),
+        label: "水闸",
       },
       {
-        value: 'storage_tank_info',
-        icon: getImageUrl('tiaoxuchi.png', 'images/NewLayercontrol'),
-        label: '调蓄池',
+        value: "storage_tank_info",
+        icon: getImageUrl("tiaoxuchi.png", "images/NewLayercontrol"),
+        label: "调蓄池",
       },
       {
-        label: '分流井',
-        value: 'diversion_well_info',
-        icon: getImageUrl('feliujin.png', 'images/NewLayercontrol'),
+        label: "分流井",
+        value: "diversion_well_info",
+        icon: getImageUrl("feliujin.png", "images/NewLayercontrol"),
       },
     ],
   },
   {
-    value: '管网',
-    label: '管网',
-    class: 'target-class',
+    value: "管网",
+    label: "管网",
+    class: "target-class",
     children: [
       {
-        value: '雨水管网',
-        label: '雨水管网',
-        icon: getImageUrl('lay-yushuiguanwang.png', 'images/NewLayercontrol'),
+        value: "雨水管网",
+        label: "雨水管网",
+        icon: getImageUrl("lay-yushuiguanwang.png", "images/NewLayercontrol"),
+        VShow: "sewage",
       },
       {
-        value: '污水管网',
-        label: '污水管网',
-        icon: getImageUrl('lay-wushuiguanwang.png', 'images/NewLayercontrol'),
+        value: "污水管网",
+        label: "污水管网",
+        icon: getImageUrl("lay-wushuiguanwang.png", "images/NewLayercontrol"),
+        VShow: "rain",
       },
     ],
   },
@@ -140,52 +154,55 @@
     ],
   },*/
   {
-    value: '监测点',
-    label: '监测点',
-    class: 'target-class',
+    value: "监测点",
+    label: "监测点",
+    class: "target-class",
     children: [
       {
-        value: 'rainwater_pipeline_quality_area',
-        label: '社区雨水接驳口',
+        value: "rainwater_pipeline_quality_area",
+        label: "社区雨水接驳口",
+        VShow: "sewage",
       },
       {
-        value: 'rainwater_pipeline_quality_city',
-        label: '市政雨水监测',
+        value: "rainwater_pipeline_quality_city",
+        label: "市政雨水监测",
+        VShow: "sewage",
       },
       {
-        value: 'sewage_pipeline_quality_city',
-        label: '市政污水监测',
+        value: "sewage_pipeline_quality_city",
+        label: "市政污水监测",
+        VShow: "rain",
       },
       {
-        value: 'outlet_quality',
-        label: '排口水质',
+        value: "outlet_quality",
+        label: "排口水质",
       },
       {
-        value: 'outlet_water_level',
-        label: '排口流量',
+        value: "outlet_water_level",
+        label: "排口流量",
       },
     ],
   },
   {
-    value: '其他',
-    label: '其他',
-    class: 'target-class',
+    value: "其他",
+    label: "其他",
+    class: "target-class",
     children: [
       {
-        value: 'drainage_info',
-        label: '排水户',
+        value: "drainage_info",
+        label: "排水户",
       },
       {
-        value: '港渠',
-        label: '港渠',
+        value: "港渠",
+        label: "港渠",
       },
       {
-        value: 'outlet_info',
-        label: '排口',
+        value: "outlet_info",
+        label: "排口",
       },
       {
-        value: '建筑物',
-        label: '建筑物',
+        value: "建筑物",
+        label: "建筑物",
       },
     ],
   },
@@ -201,7 +218,7 @@
   selectList.value = [];
   if (node) {
     let arr = [...node.checkedNodes];
-    arr.map(item => {
+    arr.map((item) => {
       if (item.value) {
         selectList.value.push(item.value);
       }
@@ -227,46 +244,48 @@
 
   openLayer.length &&
     openLayer
-      .map(i => i.split(','))
+      .map((i) => i.split(","))
       .flat(Infinity)
-      .forEach(key =>
-        bus.emit('setLayerVisible', {
+      .forEach((key) =>
+        bus.emit("setLayerVisible", {
           layername: key,
-          isCheck: key.includes('!') ? false : true,
+          isCheck: key.includes("!") ? false : true,
         })
       );
   closeLayer.length &&
     closeLayer
-      .map(i => i.split(','))
+      .map((i) => i.split(","))
       .flat(Infinity)
-      .forEach(key =>
-        bus.emit('setLayerVisible', {
+      .forEach((key) =>
+        bus.emit("setLayerVisible", {
           layername: key,
-          isCheck: key.includes('!') ? true : false,
+          isCheck: key.includes("!") ? true : false,
         })
       );
   // newfiberMap.map.triggerRepaint();
 }
 
 function changeyangshi() {
-  const targetElements = document.querySelectorAll('.target-class');
-  targetElements.forEach(target => {
+  const targetElements = document.querySelectorAll(".target-class");
+  targetElements.forEach((target) => {
     const parent = target.parentElement; // 获取父级元素
     // console.log('parent', parent);
     if (parent) {
-      parent.classList.add('mycustomclass');
+      parent.classList.add("mycustomclass");
       // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
       // 你可以在这里设置父级元素的其他样式
     }
   });
 }
-
+function filterTX(value, data, node) {
+  console.log("12121", value, data, node);
+}
 onMounted(() => {
   nextTick(() => {
     changeyangshi();
   });
-  bus.on('YQ_head', val => {
-    console.log('valvalvalval', val);
+  bus.on("YQ_head", (val) => {
+    console.log("valvalvalval", val);
     if (val == false) {
       Show.value = false;
     } else {
@@ -276,20 +295,30 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off('YQ_head');
+  bus.off("YQ_head");
 });
 
 function reset() {
   proxy.$refs.layertree.setCheckedKeys([]);
   selectList.value = [];
-  bus.emit('clearTemporaryData');
+  bus.emit("clearTemporaryData");
   bus.emit(mapInitBusName);
 }
 
 watch(
   () => appStore.MapDataCount,
   (newValue, oldValue) => {
-    dataSource.value.forEach(i => i.children.forEach(k => (k.n = newValue[k.value])));
+    dataSource.value.forEach((i) => i.children.forEach((k) => (k.n = newValue[k.value])));
+  },
+  { deep: true, once: true }
+);
+watch(
+  () => appStore.TiXiType,
+  (newValue, oldValue) => {
+    TXtYPE.value = newValue;
+    console.log("图层控制中的雨污水状态", TXtYPE.value);
+    dataSource.value = JSON.parse(JSON.stringify(dataSource.value));
+    console.log(dataSource.value);
   },
   { deep: true, once: true }
 );
@@ -346,7 +375,11 @@
 
   .mycustomclass {
     position: relative;
-    background: linear-gradient(90deg, rgba(50, 146, 255, 0.5) 0%, rgba(12, 125, 255, 0.2) 100%) !important;
+    background: linear-gradient(
+      90deg,
+      rgba(50, 146, 255, 0.5) 0%,
+      rgba(12, 125, 255, 0.2) 100%
+    ) !important;
     border-left: 4px solid #048cff;
     .el-checkbox {
       display: none;
@@ -362,7 +395,7 @@
   height: 40px;
   left: 487px;
   top: 128px;
-  background: url('@/assets/images/NewLayercontrol/layerIcon.png') no-repeat;
+  background: url("@/assets/images/NewLayercontrol/layerIcon.png") no-repeat;
   background-size: 100% 100%;
 }
 
@@ -372,7 +405,7 @@
   left: 500px;
   top: 175px;
   padding: 10px;
-  background: url('@/assets/images/NewLayercontrol/layerBg.png') no-repeat;
+  background: url("@/assets/images/NewLayercontrol/layerBg.png") no-repeat;
   background-size: 100% 100%;
   width: 200px !important;
   height: auto;
@@ -409,7 +442,11 @@
       font-family: Source Han Sans CN;
       font-weight: 500;
       color: #839ecb;
-      background: linear-gradient(0deg, rgba(27, 161, 255, 0.2) 0%, rgba(27, 161, 255, 0.1) 100%);
+      background: linear-gradient(
+        0deg,
+        rgba(27, 161, 255, 0.2) 0%,
+        rgba(27, 161, 255, 0.1) 100%
+      );
       border-radius: 12px;
       text-align: center;
     }
@@ -460,7 +497,11 @@
   left: 50%;
   transform: translateX(-50%);
   width: 60%;
-  background: linear-gradient(0deg, rgba(4, 140, 255, 0.5) 0%, rgba(4, 140, 255, 0.3) 100%);
+  background: linear-gradient(
+    0deg,
+    rgba(4, 140, 255, 0.5) 0%,
+    rgba(4, 140, 255, 0.3) 100%
+  );
   border-radius: 13px;
   border: 1px solid #2199ff;
   text-align: center;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/index.vue b/src/views/pictureOnMap/page/DrainageSystem/index.vue
index 9d843ea..dae250c 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/index.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/index.vue
@@ -22,6 +22,8 @@
 import bus from "@/bus";
 import YSIndex from "./YSIndex.vue";
 import WSIndex from "./WSIndex.vue";
+import useUserStore from "@/store/modules/user";
+const appStore = useUserStore();
 const AllData = reactive({
   yw_type: [
     {
@@ -31,9 +33,9 @@
         { key: "污水分区", visible: true },
         { key: "newfiber-XYZLayer", visible: true },
         { key: "高清地图", visible: true },
-        { key: '污水系统流向1', visible: false },
-        { key: '污水系统流向', visible: false },
-        { key: '1_污水处理厂', visible: false }
+        { key: "污水系统流向1", visible: false },
+        { key: "污水系统流向", visible: false },
+        { key: "1_污水处理厂", visible: false },
       ],
     },
     {
@@ -56,14 +58,18 @@
 const TypeClick = (item) => {
   TypeClick_(item);
   AllData.TypeID = item.key;
+  appStore.Set_TiXiType(AllData.TypeID);
 };
 const TypeClick_ = (item) => {
-  const { setLayerVisible, clearTemporaryData,wsRouteToMapByName } = events_params;
+  const { setLayerVisible, clearTemporaryData, wsRouteToMapByName } = events_params;
   closeAllLayer();
   bus.emit(clearTemporaryData.key);
   newfiberMap.map.easeTo(newfiberMap.config_.params.init);
-  item.values && item.values.filter((i) => i.visible).forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true }));
-  item.key == 'sewage' &&  bus.emit(wsRouteToMapByName.key);
+  item.values &&
+    item.values
+      .filter((i) => i.visible)
+      .forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true }));
+  item.key == "sewage" && bus.emit(wsRouteToMapByName.key);
 };
 const events_params = {
   setHighlight: { key: "setHighlight" },
@@ -73,7 +79,17 @@
 };
 const closeAllLayer = () => {
   const { setLayerVisible, setHighlight } = events_params;
-  AllData.yw_type.map((i) => i.values).filter(Boolean).flat().forEach((i) => bus.emit(setLayerVisible.key, {layername: i.key, isCheck: false, values: i.values,}));
+  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, []);
 };
 

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index bdaf63a..3923764 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -12,14 +12,18 @@
     permissions: [],
     MapData: [],
     MapDataCount: [],
+    TiXiType: ''
   }),
   actions: {
     SET_MapData(MapData) {
       this.MapData = MapData;
     },
-      SET_MapData_COUNT(count){
-          this.MapDataCount = count;
-      },
+    SET_MapData_COUNT(count) {
+      this.MapDataCount = count;
+    },
+    Set_TiXiType(data) {
+      this.TiXiType = data
+    },
     // 登录
     login(userInfo) {
       const username = userInfo.username.trim();
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 7b8cfab..99a5a56 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -411,41 +411,49 @@
   // 对 delay 进行判断，如果传递的是 null 则不需要使用 节流方案，直接返回使用 ref 创建的。
   return delay == null
     ? // 返回 ref 创建的
-      ref(data)
+    ref(data)
     : // customRef 中会返回两个函数参数。一个是：track 在获取数据时收集依赖的；一个是：trigger 在修改数据时进行通知派发更新的。
-      customRef((track, trigger) => {
-        return {
-          get() {
-            // 收集依赖
-            track();
-            // 返回当前数据的值
-            return data;
-          },
-          set(value) {
-            // 判断
-            if (timer == null) {
-              // 创建定时器
-              timer = setTimeout(() => {
-                // 修改数据
-                data = value;
-                // 派发更新
-                trigger();
-                // 清除定时器
-                clearTimeout(timer);
-                timer = null;
-              }, delay);
-            }
-          },
-        };
-      });
+    customRef((track, trigger) => {
+      return {
+        get() {
+          // 收集依赖
+          track();
+          // 返回当前数据的值
+          return data;
+        },
+        set(value) {
+          // 判断
+          if (timer == null) {
+            // 创建定时器
+            timer = setTimeout(() => {
+              // 修改数据
+              data = value;
+              // 派发更新
+              trigger();
+              // 清除定时器
+              clearTimeout(timer);
+              timer = null;
+            }, delay);
+          }
+        },
+      };
+    });
 };
 // 查找匹配对应的obj
 export const findDictObj2 = (dic, target, value) => {
   for (let i = 0; i < dic.length; i++) {
-      let id = dic[i][target];
-      if (id == value) {
-          return dic[i];
-      }
+    let id = dic[i][target];
+    if (id == value) {
+      return dic[i];
+    }
   }
   return {};
-};
\ No newline at end of file
+};
+// // 根据状态判断当前
+// export function getShow(str) {
+//   let bol = false;
+//   if (str == TXtYPE.value) {
+//     bol = true;
+//   }
+//   return bol;
+// };
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index e51ed00..3bc3b6e 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="layerControlvue" v-show="Show">
-    <div class="layericon" @click="allData.showControlBox = !allData.showControlBox"></div>
+    <div
+      class="layericon"
+      @click="allData.showControlBox = !allData.showControlBox"
+    ></div>
 
     <div class="LayerControlBox" v-show="allData.showControlBox">
       <div class="ControlBox-body">
@@ -12,6 +15,7 @@
           node-key="value"
           default-expand-all
           :expand-on-click-node="false"
+          :filter-node-method="filterTX"
           @check="check"
         >
           <template #default="{ node, data }">
@@ -26,99 +30,109 @@
   </div>
 </template>
 <script setup>
-import bus from '@/bus/';
-import useUserStore from '@/store/modules/user';
+import bus from "@/bus/";
+import useUserStore from "@/store/modules/user";
 const appStore = useUserStore();
 
-import { getImageUrl } from '@/utils/ruoyi';
-import { nextTick } from 'vue';
+import { getImageUrl } from "@/utils/ruoyi";
+import { nextTick } from "vue";
 const { proxy } = getCurrentInstance();
 const Show = ref(true);
 const selectList = ref([]);
+const TXtYPE = ref("");
 const dataSource = ref([
   {
-    value: '地图切换',
-    label: '地图切换',
-    class: 'target-class',
+    value: "地图切换",
+    label: "地图切换",
+    class: "target-class",
     children: [
       {
-        value: 'newfiber-XYZLayer,高清地图',
-        label: '影像地图',
-        icon: getImageUrl('maptwo.png', 'images/NewLayercontrol'),
+        value: "newfiber-XYZLayer,高清地图",
+        label: "影像地图",
+        icon: getImageUrl("maptwo.png", "images/NewLayercontrol"),
+        // VShow: true,
       },
     ],
   },
   {
-    value: '排水体系',
-    label: '排水体系',
-    class: 'target-class',
+    value: "排水体系",
+    label: "排水体系",
+    class: "target-class",
     children: [
       {
-        value: '雨水分区',
-        label: '雨水系统',
-        icon: getImageUrl('yuliangzhan.png', 'images/NewLayercontrol'),
+        value: "雨水分区",
+        label: "雨水系统",
+        icon: getImageUrl("yuliangzhan.png", "images/NewLayercontrol"),
+        VShow: "sewage",
       },
       {
-        value: '污水分区',
-        label: '污水系统',
-        icon: getImageUrl('zishuidian.png', 'images/NewLayercontrol'),
+        value: "污水分区",
+        label: "污水系统",
+        icon: getImageUrl("zishuidian.png", "images/NewLayercontrol"),
+        VShow: "rain",
       },
       {
-        value: '尾水路径',
-        label: '尾水路径',
-        icon: getImageUrl('尾水路径.png', 'images/NewLayercontrol'),
+        value: "尾水路径",
+        label: "尾水路径",
+        icon: getImageUrl("尾水路径.png", "images/NewLayercontrol"),
       },
       {
-        value: 'sewage_pump_station_info',
-        icon: getImageUrl('wushuibengzhan.png', 'images/NewLayercontrol'),
-        label: '污水泵站',
+        value: "sewage_pump_station_info",
+        icon: getImageUrl("wushuibengzhan.png", "images/NewLayercontrol"),
+        label: "污水泵站",
+        VShow: "rain",
       },
       {
-        value: 'sewage_factory_info',
-        icon: getImageUrl('wushuichulichang.png', 'images/NewLayercontrol'),
-        label: '污水厂',
+        value: "sewage_factory_info",
+        icon: getImageUrl("wushuichulichang.png", "images/NewLayercontrol"),
+        label: "污水厂",
+        VShow: "rain",
       },
       {
-        label: '污水处理站',
-        value: 'sewage_factory_station_info',
-        icon: getImageUrl('wushuichulizhan.png', 'images/NewLayercontrol'),
+        label: "污水处理站",
+        value: "sewage_factory_station_info",
+        icon: getImageUrl("wushuichulizhan.png", "images/NewLayercontrol"),
+        VShow: "rain",
       },
       {
-        value: 'rain_water_pump_station_info',
-        icon: getImageUrl('yushuibengzhan.png', 'images/NewLayercontrol'),
-        label: '雨水泵站',
+        value: "rain_water_pump_station_info",
+        icon: getImageUrl("yushuibengzhan.png", "images/NewLayercontrol"),
+        label: "雨水泵站",
+        VShow: "sewage",
       },
       {
-        value: 'water_gate_info',
-        icon: getImageUrl('shuizha.png', 'images/NewLayercontrol'),
-        label: '水闸',
+        value: "water_gate_info",
+        icon: getImageUrl("shuizha.png", "images/NewLayercontrol"),
+        label: "水闸",
       },
       {
-        value: 'storage_tank_info',
-        icon: getImageUrl('tiaoxuchi.png', 'images/NewLayercontrol'),
-        label: '调蓄池',
+        value: "storage_tank_info",
+        icon: getImageUrl("tiaoxuchi.png", "images/NewLayercontrol"),
+        label: "调蓄池",
       },
       {
-        label: '分流井',
-        value: 'diversion_well_info',
-        icon: getImageUrl('feliujin.png', 'images/NewLayercontrol'),
+        label: "分流井",
+        value: "diversion_well_info",
+        icon: getImageUrl("feliujin.png", "images/NewLayercontrol"),
       },
     ],
   },
   {
-    value: '管网',
-    label: '管网',
-    class: 'target-class',
+    value: "管网",
+    label: "管网",
+    class: "target-class",
     children: [
       {
-        value: '雨水管网',
-        label: '雨水管网',
-        icon: getImageUrl('lay-yushuiguanwang.png', 'images/NewLayercontrol'),
+        value: "雨水管网",
+        label: "雨水管网",
+        icon: getImageUrl("lay-yushuiguanwang.png", "images/NewLayercontrol"),
+        VShow: "sewage",
       },
       {
-        value: '污水管网',
-        label: '污水管网',
-        icon: getImageUrl('lay-wushuiguanwang.png', 'images/NewLayercontrol'),
+        value: "污水管网",
+        label: "污水管网",
+        icon: getImageUrl("lay-wushuiguanwang.png", "images/NewLayercontrol"),
+        VShow: "rain",
       },
     ],
   },
@@ -140,52 +154,55 @@
     ],
   },*/
   {
-    value: '监测点',
-    label: '监测点',
-    class: 'target-class',
+    value: "监测点",
+    label: "监测点",
+    class: "target-class",
     children: [
       {
-        value: 'rainwater_pipeline_quality_area',
-        label: '社区雨水接驳口',
+        value: "rainwater_pipeline_quality_area",
+        label: "社区雨水接驳口",
+        VShow: "sewage",
       },
       {
-        value: 'rainwater_pipeline_quality_city',
-        label: '市政雨水监测',
+        value: "rainwater_pipeline_quality_city",
+        label: "市政雨水监测",
+        VShow: "sewage",
       },
       {
-        value: 'sewage_pipeline_quality_city',
-        label: '市政污水监测',
+        value: "sewage_pipeline_quality_city",
+        label: "市政污水监测",
+        VShow: "rain",
       },
       {
-        value: 'outlet_quality',
-        label: '排口水质',
+        value: "outlet_quality",
+        label: "排口水质",
       },
       {
-        value: 'outlet_water_level',
-        label: '排口流量',
+        value: "outlet_water_level",
+        label: "排口流量",
       },
     ],
   },
   {
-    value: '其他',
-    label: '其他',
-    class: 'target-class',
+    value: "其他",
+    label: "其他",
+    class: "target-class",
     children: [
       {
-        value: 'drainage_info',
-        label: '排水户',
+        value: "drainage_info",
+        label: "排水户",
       },
       {
-        value: '港渠',
-        label: '港渠',
+        value: "港渠",
+        label: "港渠",
       },
       {
-        value: 'outlet_info',
-        label: '排口',
+        value: "outlet_info",
+        label: "排口",
       },
       {
-        value: '建筑物',
-        label: '建筑物',
+        value: "建筑物",
+        label: "建筑物",
       },
     ],
   },
@@ -201,7 +218,7 @@
   selectList.value = [];
   if (node) {
     let arr = [...node.checkedNodes];
-    arr.map(item => {
+    arr.map((item) => {
       if (item.value) {
         selectList.value.push(item.value);
       }
@@ -227,46 +244,48 @@
 
   openLayer.length &&
     openLayer
-      .map(i => i.split(','))
+      .map((i) => i.split(","))
       .flat(Infinity)
-      .forEach(key =>
-        bus.emit('setLayerVisible', {
+      .forEach((key) =>
+        bus.emit("setLayerVisible", {
           layername: key,
-          isCheck: key.includes('!') ? false : true,
+          isCheck: key.includes("!") ? false : true,
         })
       );
   closeLayer.length &&
     closeLayer
-      .map(i => i.split(','))
+      .map((i) => i.split(","))
       .flat(Infinity)
-      .forEach(key =>
-        bus.emit('setLayerVisible', {
+      .forEach((key) =>
+        bus.emit("setLayerVisible", {
           layername: key,
-          isCheck: key.includes('!') ? true : false,
+          isCheck: key.includes("!") ? true : false,
         })
       );
   // newfiberMap.map.triggerRepaint();
 }
 
 function changeyangshi() {
-  const targetElements = document.querySelectorAll('.target-class');
-  targetElements.forEach(target => {
+  const targetElements = document.querySelectorAll(".target-class");
+  targetElements.forEach((target) => {
     const parent = target.parentElement; // 获取父级元素
     // console.log('parent', parent);
     if (parent) {
-      parent.classList.add('mycustomclass');
+      parent.classList.add("mycustomclass");
       // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
       // 你可以在这里设置父级元素的其他样式
     }
   });
 }
-
+function filterTX(value, data, node) {
+  console.log("12121", value, data, node);
+}
 onMounted(() => {
   nextTick(() => {
     changeyangshi();
   });
-  bus.on('YQ_head', val => {
-    console.log('valvalvalval', val);
+  bus.on("YQ_head", (val) => {
+    console.log("valvalvalval", val);
     if (val == false) {
       Show.value = false;
     } else {
@@ -276,20 +295,30 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off('YQ_head');
+  bus.off("YQ_head");
 });
 
 function reset() {
   proxy.$refs.layertree.setCheckedKeys([]);
   selectList.value = [];
-  bus.emit('clearTemporaryData');
+  bus.emit("clearTemporaryData");
   bus.emit(mapInitBusName);
 }
 
 watch(
   () => appStore.MapDataCount,
   (newValue, oldValue) => {
-    dataSource.value.forEach(i => i.children.forEach(k => (k.n = newValue[k.value])));
+    dataSource.value.forEach((i) => i.children.forEach((k) => (k.n = newValue[k.value])));
+  },
+  { deep: true, once: true }
+);
+watch(
+  () => appStore.TiXiType,
+  (newValue, oldValue) => {
+    TXtYPE.value = newValue;
+    console.log("图层控制中的雨污水状态", TXtYPE.value);
+    dataSource.value = JSON.parse(JSON.stringify(dataSource.value));
+    console.log(dataSource.value);
   },
   { deep: true, once: true }
 );
@@ -346,7 +375,11 @@
 
   .mycustomclass {
     position: relative;
-    background: linear-gradient(90deg, rgba(50, 146, 255, 0.5) 0%, rgba(12, 125, 255, 0.2) 100%) !important;
+    background: linear-gradient(
+      90deg,
+      rgba(50, 146, 255, 0.5) 0%,
+      rgba(12, 125, 255, 0.2) 100%
+    ) !important;
     border-left: 4px solid #048cff;
     .el-checkbox {
       display: none;
@@ -362,7 +395,7 @@
   height: 40px;
   left: 487px;
   top: 128px;
-  background: url('@/assets/images/NewLayercontrol/layerIcon.png') no-repeat;
+  background: url("@/assets/images/NewLayercontrol/layerIcon.png") no-repeat;
   background-size: 100% 100%;
 }
 
@@ -372,7 +405,7 @@
   left: 500px;
   top: 175px;
   padding: 10px;
-  background: url('@/assets/images/NewLayercontrol/layerBg.png') no-repeat;
+  background: url("@/assets/images/NewLayercontrol/layerBg.png") no-repeat;
   background-size: 100% 100%;
   width: 200px !important;
   height: auto;
@@ -409,7 +442,11 @@
       font-family: Source Han Sans CN;
       font-weight: 500;
       color: #839ecb;
-      background: linear-gradient(0deg, rgba(27, 161, 255, 0.2) 0%, rgba(27, 161, 255, 0.1) 100%);
+      background: linear-gradient(
+        0deg,
+        rgba(27, 161, 255, 0.2) 0%,
+        rgba(27, 161, 255, 0.1) 100%
+      );
       border-radius: 12px;
       text-align: center;
     }
@@ -460,7 +497,11 @@
   left: 50%;
   transform: translateX(-50%);
   width: 60%;
-  background: linear-gradient(0deg, rgba(4, 140, 255, 0.5) 0%, rgba(4, 140, 255, 0.3) 100%);
+  background: linear-gradient(
+    0deg,
+    rgba(4, 140, 255, 0.5) 0%,
+    rgba(4, 140, 255, 0.3) 100%
+  );
   border-radius: 13px;
   border: 1px solid #2199ff;
   text-align: center;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/index.vue b/src/views/pictureOnMap/page/DrainageSystem/index.vue
index 9d843ea..dae250c 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/index.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/index.vue
@@ -22,6 +22,8 @@
 import bus from "@/bus";
 import YSIndex from "./YSIndex.vue";
 import WSIndex from "./WSIndex.vue";
+import useUserStore from "@/store/modules/user";
+const appStore = useUserStore();
 const AllData = reactive({
   yw_type: [
     {
@@ -31,9 +33,9 @@
         { key: "污水分区", visible: true },
         { key: "newfiber-XYZLayer", visible: true },
         { key: "高清地图", visible: true },
-        { key: '污水系统流向1', visible: false },
-        { key: '污水系统流向', visible: false },
-        { key: '1_污水处理厂', visible: false }
+        { key: "污水系统流向1", visible: false },
+        { key: "污水系统流向", visible: false },
+        { key: "1_污水处理厂", visible: false },
       ],
     },
     {
@@ -56,14 +58,18 @@
 const TypeClick = (item) => {
   TypeClick_(item);
   AllData.TypeID = item.key;
+  appStore.Set_TiXiType(AllData.TypeID);
 };
 const TypeClick_ = (item) => {
-  const { setLayerVisible, clearTemporaryData,wsRouteToMapByName } = events_params;
+  const { setLayerVisible, clearTemporaryData, wsRouteToMapByName } = events_params;
   closeAllLayer();
   bus.emit(clearTemporaryData.key);
   newfiberMap.map.easeTo(newfiberMap.config_.params.init);
-  item.values && item.values.filter((i) => i.visible).forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true }));
-  item.key == 'sewage' &&  bus.emit(wsRouteToMapByName.key);
+  item.values &&
+    item.values
+      .filter((i) => i.visible)
+      .forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true }));
+  item.key == "sewage" && bus.emit(wsRouteToMapByName.key);
 };
 const events_params = {
   setHighlight: { key: "setHighlight" },
@@ -73,7 +79,17 @@
 };
 const closeAllLayer = () => {
   const { setLayerVisible, setHighlight } = events_params;
-  AllData.yw_type.map((i) => i.values).filter(Boolean).flat().forEach((i) => bus.emit(setLayerVisible.key, {layername: i.key, isCheck: false, values: i.values,}));
+  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, []);
 };
 
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index e4ca055..8ed77b0 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -266,6 +266,8 @@
 import bus from "@/bus";
 import MonLineChartsLeft from "./components/MonLineChartsLeft.vue";
 import * as MonitorAPI from "@/api/MonitoringAnalysis.js";
+import useUserStore from "@/store/modules/user";
+const appStore = useUserStore();
 // 引入弹窗组件
 import Gwpd from "./tab_components/gwpd.vue";
 import Dgtxg from "./tab_components/dgtxg.vue";
@@ -515,6 +517,7 @@
   AllData.regionName = "";
   // 切换时回到默认一级分区
   AllData.TypeID = type;
+  appStore.Set_TiXiType(AllData.TypeID);
   if (AllData.TypeID == "sewage") {
     // 污水
     AllData.TitleName[0].abbreviation = "高新区";