diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index 2a6d65b..f94a395 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -534,9 +534,12 @@
     };
 
     const refreshGeoJSON = () => {
-      Object.keys(geojson).forEach(
-        (key) => map.getSource(key) && map.getSource(key).setData(geojson[key])
-      );
+      const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches);
+      Object.keys(geojson).forEach((key) => {
+        map.getSource(key) && map.getSource(key).setData(geojson[key]);
+        cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles());
+        console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key)));
+      });
       map.triggerRepaint();
     };
 

diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index 2a6d65b..f94a395 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -534,9 +534,12 @@
     };
 
     const refreshGeoJSON = () => {
-      Object.keys(geojson).forEach(
-        (key) => map.getSource(key) && map.getSource(key).setData(geojson[key])
-      );
+      const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches);
+      Object.keys(geojson).forEach((key) => {
+        map.getSource(key) && map.getSource(key).setData(geojson[key]);
+        cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles());
+        console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key)));
+      });
       map.triggerRepaint();
     };
 
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 5b05425..1df1977 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -351,19 +351,19 @@
     ({
       1: () => {
         !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init);
-        [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][
+        [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][
           Number(isYS)
         ]();
       },
       2: () => {
-        [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][
+        [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][
           Number(isYS)
         ]();
       },
       3: () => {
         [
           () => {
-            wsRouteToMapByName(properties);
+            wsRouteToMapByName([properties]);
           },
           () => {
             const _keys_ = [
@@ -427,85 +427,7 @@
       psfq.prevIds.push(properties);
   }
 
-  function wsRouteToMapByName(properties) {
-    const _keys_ = [
-      "污水系统流向1",
-      "污水系统流向",
-      "1_泵站",
-      "1_污水处理厂",
-      "sewage_pipeline_quality1",
-      "sewage_pump_station_info1",
-      "storage_tank_info1",
-    ];
-    _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
-    busEmit(removeMapDatas.key, _keys_);
-    let features = _.cloneDeep(
-      ws_routeGeoJSON.features.filter((i) =>
-        i.properties.bind.split(",").includes(properties.name)
-      )
-    );
-    let geojson = turf.featureCollection(
-      features.map((i) =>
-        Object.assign(i, {
-          properties: {
-            ...i.properties,
-            name: i.properties.name,
-            type: i.properties._type || "污水系统流向1",
-            color: "rgb(255,74,25)",
-            width: [0, 7, 5, 3][properties.level],
-          },
-        })
-      )
-    );
-    newfiberMap
-      .getLayers()
-      .filter((i) => i.newfiberId == _keys_[1])[0]
-      .setData(geojson);
-    busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] });
 
-    let [features_point, features_point1, features_point2] = [[], [], []];
-    let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0];
-    if (["2", "3"].includes(properties.level)) {
-      let kk = _.replace(_keys_[4], /\d+/g, "");
-      features_point = _.cloneDeep(
-        newfiberMap.map
-          .getSource("point")
-          ._data.features.filter((i) => i.properties.type.includes(kk))
-          .filter((o) => turf.booleanPointInPolygon(o, polygon))
-      );
-      features_point1 = _.cloneDeep(
-        newfiberMap.map
-          .getSource("point")
-          ._data.features.filter((i) => _keys_[5].includes(i.properties.type))
-          .filter((o) => turf.booleanPointInPolygon(o, polygon))
-      );
-    }
-    features_point2 = _.cloneDeep(
-      newfiberMap.map
-        .getSource("point")
-        ._data.features.filter((i) => _keys_[6].includes(i.properties.type))
-        .filter((o) => turf.booleanPointInPolygon(o, polygon))
-    );
-    let geojson1 = turf.featureCollection(
-      [
-        ...features_point.map((i) => ({
-          ...i,
-          properties: { ...i.properties, type: _keys_[4] },
-        })),
-        ...features_point1.map((i) => ({
-          ...i,
-          properties: { ...i.properties, type: _keys_[5] },
-        })),
-        ...features_point2.map((i) => ({
-          ...i,
-          properties: { ...i.properties, type: _keys_[6] },
-        })),
-      ]
-        .flat()
-        .filter(Boolean)
-    );
-    busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] });
-  }
 
   function showOutletInfo(properties) {
     const key = "outlet_info";
@@ -647,6 +569,36 @@
   }
 };
 
+function wsRouteToMapByName(properties) {
+  const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
+  const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"];
+  _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
+  busEmit(removeMapDatas.key, _keys_);
+  if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties);
+  let geojson =  turf.featureCollection([]);
+  properties.forEach(p => {
+    let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name)));
+    geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},})));
+    busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] });
+  })
+  newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson);
+  if(properties.length != 1) return;
+  let [features_point, features_point1, features_point2] = [[], [], []];
+  let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0];
+  if (["2", "3"].includes(properties[0].level)) {
+    let kk = _.replace(_keys_[4], /\d+/g, "");
+    features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon)));
+    features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon)));
+  }
+  features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon)));
+  let geojson1 = turf.featureCollection([
+    ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})),
+    ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})),
+    ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },}))
+          ].flat().filter(Boolean)
+  );
+  busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] });
+}
 function clearRouteMethod() {
   const { removeMapDatas } = events_params;
   const _keys = [
@@ -1172,6 +1124,7 @@
   trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap },
   clearTrajectory: { key: "clearTrajectory", method: clearTrajectory },
   clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData },
+  wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName },
   load3DTiles: { key: "load3DTiles", method: load3DTiles },
   remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles },
   isOpenPanorama: {

diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index 2a6d65b..f94a395 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -534,9 +534,12 @@
     };
 
     const refreshGeoJSON = () => {
-      Object.keys(geojson).forEach(
-        (key) => map.getSource(key) && map.getSource(key).setData(geojson[key])
-      );
+      const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches);
+      Object.keys(geojson).forEach((key) => {
+        map.getSource(key) && map.getSource(key).setData(geojson[key]);
+        cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles());
+        console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key)));
+      });
       map.triggerRepaint();
     };
 
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 5b05425..1df1977 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -351,19 +351,19 @@
     ({
       1: () => {
         !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init);
-        [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][
+        [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][
           Number(isYS)
         ]();
       },
       2: () => {
-        [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][
+        [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][
           Number(isYS)
         ]();
       },
       3: () => {
         [
           () => {
-            wsRouteToMapByName(properties);
+            wsRouteToMapByName([properties]);
           },
           () => {
             const _keys_ = [
@@ -427,85 +427,7 @@
       psfq.prevIds.push(properties);
   }
 
-  function wsRouteToMapByName(properties) {
-    const _keys_ = [
-      "污水系统流向1",
-      "污水系统流向",
-      "1_泵站",
-      "1_污水处理厂",
-      "sewage_pipeline_quality1",
-      "sewage_pump_station_info1",
-      "storage_tank_info1",
-    ];
-    _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
-    busEmit(removeMapDatas.key, _keys_);
-    let features = _.cloneDeep(
-      ws_routeGeoJSON.features.filter((i) =>
-        i.properties.bind.split(",").includes(properties.name)
-      )
-    );
-    let geojson = turf.featureCollection(
-      features.map((i) =>
-        Object.assign(i, {
-          properties: {
-            ...i.properties,
-            name: i.properties.name,
-            type: i.properties._type || "污水系统流向1",
-            color: "rgb(255,74,25)",
-            width: [0, 7, 5, 3][properties.level],
-          },
-        })
-      )
-    );
-    newfiberMap
-      .getLayers()
-      .filter((i) => i.newfiberId == _keys_[1])[0]
-      .setData(geojson);
-    busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] });
 
-    let [features_point, features_point1, features_point2] = [[], [], []];
-    let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0];
-    if (["2", "3"].includes(properties.level)) {
-      let kk = _.replace(_keys_[4], /\d+/g, "");
-      features_point = _.cloneDeep(
-        newfiberMap.map
-          .getSource("point")
-          ._data.features.filter((i) => i.properties.type.includes(kk))
-          .filter((o) => turf.booleanPointInPolygon(o, polygon))
-      );
-      features_point1 = _.cloneDeep(
-        newfiberMap.map
-          .getSource("point")
-          ._data.features.filter((i) => _keys_[5].includes(i.properties.type))
-          .filter((o) => turf.booleanPointInPolygon(o, polygon))
-      );
-    }
-    features_point2 = _.cloneDeep(
-      newfiberMap.map
-        .getSource("point")
-        ._data.features.filter((i) => _keys_[6].includes(i.properties.type))
-        .filter((o) => turf.booleanPointInPolygon(o, polygon))
-    );
-    let geojson1 = turf.featureCollection(
-      [
-        ...features_point.map((i) => ({
-          ...i,
-          properties: { ...i.properties, type: _keys_[4] },
-        })),
-        ...features_point1.map((i) => ({
-          ...i,
-          properties: { ...i.properties, type: _keys_[5] },
-        })),
-        ...features_point2.map((i) => ({
-          ...i,
-          properties: { ...i.properties, type: _keys_[6] },
-        })),
-      ]
-        .flat()
-        .filter(Boolean)
-    );
-    busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] });
-  }
 
   function showOutletInfo(properties) {
     const key = "outlet_info";
@@ -647,6 +569,36 @@
   }
 };
 
+function wsRouteToMapByName(properties) {
+  const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
+  const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"];
+  _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
+  busEmit(removeMapDatas.key, _keys_);
+  if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties);
+  let geojson =  turf.featureCollection([]);
+  properties.forEach(p => {
+    let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name)));
+    geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},})));
+    busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] });
+  })
+  newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson);
+  if(properties.length != 1) return;
+  let [features_point, features_point1, features_point2] = [[], [], []];
+  let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0];
+  if (["2", "3"].includes(properties[0].level)) {
+    let kk = _.replace(_keys_[4], /\d+/g, "");
+    features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon)));
+    features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon)));
+  }
+  features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon)));
+  let geojson1 = turf.featureCollection([
+    ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})),
+    ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})),
+    ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },}))
+          ].flat().filter(Boolean)
+  );
+  busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] });
+}
 function clearRouteMethod() {
   const { removeMapDatas } = events_params;
   const _keys = [
@@ -1172,6 +1124,7 @@
   trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap },
   clearTrajectory: { key: "clearTrajectory", method: clearTrajectory },
   clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData },
+  wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName },
   load3DTiles: { key: "load3DTiles", method: load3DTiles },
   remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles },
   isOpenPanorama: {
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 9d1074a..7ddbafd 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -2,11 +2,7 @@
   <div class="pictureOnMap">
     <TopTab />
     <div class="mainContentBox">
-      <MapBox
-        :initJson="`/static/libs/mapbox/style/wh_dhgx.json`"
-        :loadCallback="loadCallback"
-        @mapClick1="mapClick1"
-      ></MapBox>
+      <MapBox :initJson="`/static/libs/mapbox/style/wh_dhgx.json`" :loadCallback="loadCallback" @mapClick1="mapClick1"></MapBox>
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
@@ -40,23 +36,23 @@
   </div>
 </template>
 <script setup>
-import { useRouter } from "vue-router";
+import { useRouter } from 'vue-router';
 
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { ref, reactive, onMounted, nextTick } from "vue";
-import TopTab from "./TopTab/index.vue";
-import MapBox from "../../components/Map/MapBox";
-import bus from "@/bus";
-import useUserStore from "@/store/modules/user";
-import DialogTabs from "@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue";
-import { drainageDispatchGetMenu } from "@/api/MonitorAssetsOnMap";
-import recordPage from "@/views/voice/recordPage/index";
-import usepartitionStore from "@/store/modules/partition";
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { ref, reactive, onMounted, nextTick } from 'vue';
+import TopTab from './TopTab/index.vue';
+import MapBox from '../../components/Map/MapBox';
+import bus from '@/bus';
+import useUserStore from '@/store/modules/user';
+import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
+import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import recordPage from '@/views/voice/recordPage/index';
+import usepartitionStore from '@/store/modules/partition';
 
-import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
-import inputSearch from "@/views/pictureOnMap/inputSearch.vue";
-import { FALSE } from "ol/functions";
+import LayerControl from '@/views/pictureOnMap/LayerControl.vue';
+import inputSearch from '@/views/pictureOnMap/inputSearch.vue';
+import { FALSE } from 'ol/functions';
 
 const useStore = usepartitionStore();
 const router = useRouter();
@@ -69,14 +65,14 @@
 const GetcomIDs = ref([]);
 const dialogConfig = reactive({
   visible: false,
-  dataID: "",
-  dataCode: "",
+  dataID: '',
+  dataCode: '',
   data: {},
   comIDs: [],
   customData: [],
-  RefName: "",
-  title: "详情",
-  typeName: "",
+  RefName: '',
+  title: '详情',
+  typeName: '',
 });
 const closediaMeth = () => {
   dialogConfig.visible = false;
@@ -84,47 +80,47 @@
 // 站点数组
 const arrstcode = ref([
   // 站点类型名称: 编码
-  "outlet_water_level", // 排口流量
-  "outlet_quality", // 排口水质
-  "channel_quality", // 港渠水质
-  "channel_water_level", // 港渠水位
-  "lake_water_level", // 湖泊水位
-  "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
-  "rain", // 雨量站
-  "rainwater_pipeline_quality", // 雨水管网水质
-  "sewage_pipeline_quality", // 污水管网水质
-  "rainwater_pipeline_quality_area", // 接驳口
-  "rainwater_pipeline_water_level", // 雨水管网液位
-  "reservoir_water_level", //水库水位
-  "rainPumpStation", //雨水泵站
-  "dirtyPumpStation", //污水泵站
-  "sewageStation", //污水厂
-  "gateStation", //闸门
-  "pump_water_level", //泵站液位
+  'outlet_water_level', // 排口流量
+  'outlet_quality', // 排口水质
+  'channel_quality', // 港渠水质
+  'channel_water_level', // 港渠水位
+  'lake_water_level', // 湖泊水位
+  'waterlogging', // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
+  'rain', // 雨量站
+  'rainwater_pipeline_quality', // 雨水管网水质
+  'sewage_pipeline_quality', // 污水管网水质
+  'rainwater_pipeline_quality_area', // 接驳口
+  'rainwater_pipeline_water_level', // 雨水管网液位
+  'reservoir_water_level', //水库水位
+  'rainPumpStation', //雨水泵站
+  'dirtyPumpStation', //污水泵站
+  'sewageStation', //污水厂
+  'gateStation', //闸门
+  'pump_water_level', //泵站液位
 ]);
 // 基本数据
 const arrid = ref([
-  "diversion_well_info", // 分流井
-  "drainage_info", // 排水户
-  "lake_info", // 湖泊
-  "outlet_info", // 排口
-  "port_channel_info", // 港渠
-  "rain_water_pump_station_info", // 雨水泵站
-  "region_info", // 分区信息
-  "reservoir_info", // 水库
-  "sewage_factory_info", // 污水处理厂
-  "sewage_factory_station_info", //污水处理站
-  "sewage_pump_station_info", // 污水泵站
-  "storage_tank_info", // 调蓄池
-  "water_gate_info", // 水闸
-  "waterlogging_point_info", // 渍水点
-  "water_region_info", // 水系汇水分区
-  "storehouse", //物资仓库
-  "dikeGood", //堤防备料
+  'diversion_well_info', // 分流井
+  'drainage_info', // 排水户
+  'lake_info', // 湖泊
+  'outlet_info', // 排口
+  'port_channel_info', // 港渠
+  'rain_water_pump_station_info', // 雨水泵站
+  'region_info', // 分区信息
+  'reservoir_info', // 水库
+  'sewage_factory_info', // 污水处理厂
+  'sewage_factory_station_info', //污水处理站
+  'sewage_pump_station_info', // 污水泵站
+  'storage_tank_info', // 调蓄池
+  'water_gate_info', // 水闸
+  'waterlogging_point_info', // 渍水点
+  'water_region_info', // 水系汇水分区
+  'storehouse', //物资仓库
+  'dikeGood', //堤防备料
 ]);
 // 基础数据
 const switchStcode = (Name, type) => {
-  if (type == "outlet_info") {
+  if (type == 'outlet_info') {
     pkClick(Getproperties.value);
   }
   console.log("GetcomIDs.value", GetcomIDs.value);
@@ -147,23 +143,19 @@
     dialogConfig.visible = true;
     dialogConfig.dataCode = type;
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.dataID = Getproperties.value.pid
-      ? Getproperties.value.pid
-      : Getproperties.value.id;
+    dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
   } else {
     return;
   }
 };
 // 类型弹框判断
-const typecodeswitch = (type) => {
+const typecodeswitch = type => {
   if (diabox[type]) {
     // console.log('diabox[type]', diabox[type]);
-    window[type + "_map"] = diabox[type]
-      .filter((i) => i.geometry)
+    window[type + '_map'] = diabox[type]
+      .filter(i => i.geometry)
       .map((item, index) => {
-        let coordinates = turf.getCoords(
-          turf.center(Terraformer.WKT.parse(item.geometry))
-        );
+        let coordinates = turf.getCoords(turf.center(Terraformer.WKT.parse(item.geometry)));
         const popup = new mapboxgl1.Popup({
           closeButton: false,
           closeOnClick: false,
@@ -177,7 +169,7 @@
       });
 
     nextTick(() => {
-      window[type + "_map"].forEach((i) => i._setOpacity(0));
+      window[type + '_map'].forEach(i => i._setOpacity(0));
     });
   }
 };
@@ -185,7 +177,7 @@
   let typearr = [];
   for (var k in diabox) {
     typearr.push(k);
-    appStore.MapData.map((item) => {
+    appStore.MapData.map(item => {
       if (item.pointType == k) {
         diabox[k] = item.data;
       }
@@ -210,53 +202,53 @@
   }
 };
 // 智慧水务大脑一张图 特定大屏动态菜单
-const specificFun = (type) => {
+const specificFun = type => {
   // 监测预警模块弹框
   // value值 统一菜单类型
   //name值 特指智慧水务大脑获取的动态菜单类型
   let arr = [
     {
-      name: "dp_zsfx", //渍水点
-      value: "waterlogging",
+      name: 'dp_zsfx', //渍水点
+      value: 'waterlogging',
     },
     {
-      name: "dp_hhsq", //河湖水情
-      value: "lake_water_level",
+      name: 'dp_hhsq', //河湖水情
+      value: 'lake_water_level',
     },
     {
-      name: "dp_bzgq", //泵站工情
-      value: "rainPumpStation", //雨水泵站
+      name: 'dp_bzgq', //泵站工情
+      value: 'rainPumpStation', //雨水泵站
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_water_level", //雨水管网液位
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_water_level', //雨水管网液位
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_gwfx", //接驳口
-      value: "rainwater_pipeline_quality_area", //接驳口
+      name: 'dp_gwfx', //接驳口
+      value: 'rainwater_pipeline_quality_area', //接驳口
     },
     {
-      name: "dp_wsgwfx", //大屏污水管网风险分析弹框
-      value: "sewage_pipeline_quality", //雨水管网水质
+      name: 'dp_wsgwfx', //大屏污水管网风险分析弹框
+      value: 'sewage_pipeline_quality', //雨水管网水质
     },
     // {
     //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
     //   value: "rainwater_pipeline_quality", //雨水管网水质
     // },
   ];
-  return arr.find((item) => item.value == type)?.name || null;
+  return arr.find(item => item.value == type)?.name || null;
 };
 
 // 获取动态弹框菜单
 const GetBoxmenu = (Name, type) => {
-  console.log("name", Name);
-  console.log("type", type);
+  console.log('name', Name);
+  console.log('type', type);
   GetcomIDs.value = [];
-  let dataId = "";
+  let dataId = '';
   if (arrstcode.value.includes(type)) {
     dataId = Getproperties.value.stCode;
   }
@@ -264,11 +256,11 @@
   if (arrid.value.includes(type)) {
     dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
   }
-  console.log("dataId", dataId);
+  console.log('dataId', dataId);
   if (!dataId) {
     //渍水调度
-    if (type == "waterlog_point") {
-      bus.emit("showZSdispatch", Getproperties.value);
+    if (type == 'waterlog_point') {
+      bus.emit('showZSdispatch', Getproperties.value);
     }
     // proxy.$modal.msgSuccess('');
     return;
@@ -276,15 +268,15 @@
   // debugger;
   let params = {
     dataCode: type,
-    scene: specificFun(type) || "basis_monitor",
+    scene: specificFun(type) || 'basis_monitor',
     // scene: "basis_monitor",
     dataId: dataId,
   };
-  drainageDispatchGetMenu(params).then((res) => {
-    console.log("获得的菜单", res.data);
+  drainageDispatchGetMenu(params).then(res => {
+    console.log('获得的菜单', res.data);
     Getmenuarr.value = res.data;
     if (res.data && res.data.length) {
-      res.data.map((item) => {
+      res.data.map(item => {
         GetcomIDs.value.push(item.moduleName);
       });
     }
@@ -299,113 +291,105 @@
 const pointandlineOpen = (type, properties) => {
   dialogConfig.visible = true;
   switch (type) {
-    case "pipeline_info_text":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info_text':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_info":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_point":
-      dialogConfig.title = "管点信息";
+    case 'pipeline_point':
+      dialogConfig.title = '管点信息';
       break;
-    case "point":
-      dialogConfig.title = "问题管线";
+    case 'point':
+      dialogConfig.title = '问题管线';
       break;
   }
 
   Getmenuarr.value = [
     {
-      menuName: "管网信息",
+      menuName: '管网信息',
       show: true,
-      moduleName: "PointAndLine",
+      moduleName: 'PointAndLine',
     },
   ];
   // debugger;
   // dialogConfig.dataID = '0371000003';
-  dialogConfig.comIDs = ["PointAndLine"];
-  dialogConfig.RefName = "PointAndLine";
+  dialogConfig.comIDs = ['PointAndLine'];
+  dialogConfig.RefName = 'PointAndLine';
 };
 const loadCallback = () => {};
 // 排口溯源
-const pkClick = async (properties) => {
+const pkClick = async properties => {
   // debugger;
   if (!properties.wellCode) return;
   let results = await upStreamAnalyse({ endPointNumber: properties.wellCode });
   let pipelines = results.data.pipelineInfoList
-    .map((i) =>
+    .map(i =>
       turf.feature(Terraformer.WKT.parse(i.geometrys), {
         ...i,
-        area: i.pipelineType == "Rain" ? "雨水" : "污水",
+        area: i.pipelineType == 'Rain' ? '雨水' : '污水',
       })
     )
-    .map((i) =>
-      i.properties.flowDirection == 0
-        ? turf.lineString(turf.getCoords(i).reverse(), i.properties)
-        : i
-    );
+    .map(i => (i.properties.flowDirection == 0 ? turf.lineString(turf.getCoords(i).reverse(), i.properties) : i));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "水系流向")[0]
+    .filter(i => i.newfiberId == '水系流向')[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 };
 
-const a = (properties) => {
-  const keys_ = ["雨水", "污水"];
-  const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-  bus.emit("removeMapDatas", keys);
+const a = properties => {
+  const keys_ = ['雨水', '污水'];
+  const keys = ['1_泵站', '1_污水处理厂', '分区流向', '分区流向1'];
+  bus.emit('removeMapDatas', keys);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection([]));
   const key = properties.c_layer.includes(keys_[0]) ? keys_[0] : keys_[1];
   const nameKey = properties.name.substring(0, 2);
-  let features = line.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.name.includes(nameKey)
-  );
-  let features1 = point.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.system.includes(nameKey)
-  );
-  let points = _.groupBy(features1, (a) => a.properties.type);
-  features.forEach((i) => {
+  let features = line.features.filter(i => i.properties.area.includes(key) && i.properties.name.includes(nameKey));
+  let features1 = point.features.filter(i => i.properties.area.includes(key) && i.properties.system.includes(nameKey));
+  let points = _.groupBy(features1, a => a.properties.type);
+  features.forEach(i => {
     i.properties.type = keys[2];
-    i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)";
+    i.properties.color = key == keys_[0] ? 'rgba(21,127,176,1)' : 'rgba(255,0,0,1)';
   });
-  Object.keys(points).map((key) =>
-    bus.emit("setGeoJSON", {
+  Object.keys(points).map(key =>
+    bus.emit('setGeoJSON', {
       json: turf.featureCollection(
-        points[key].map((i) => ({
+        points[key].map(i => ({
           type: i.type,
           geometry: i.geometry,
-          properties: { ...i.properties, type: "1_" + key },
+          properties: { ...i.properties, type: '1_' + key },
         }))
       ),
-      key: "1_" + key,
+      key: '1_' + key,
     })
   );
-  bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
+  bus.emit('setGeoJSON', { json: turf.featureCollection(features), key: keys[2] });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection(features));
 };
 
 const mapClick1 = (lngLat, properties = {}, layerId) => {
-  console.log("经纬度", lngLat);
-  console.log("数据", properties);
-  console.log("layerid", layerId);
+  console.log('经纬度', lngLat);
+  console.log('数据', properties);
+  console.log('layerid', layerId);
   dialogConfig.title = properties.stName || properties.name;
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : "" || 1;
-  let Name = properties ? properties.pointTypeName : "" || "";
+  let type = properties ? properties.type : '' || 1;
+  let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
-  console.log("1111", type, layerId);
+  console.log('1111', type, layerId);
 
-  if (properties.layer == "排水分区") {
+  if (properties.layer == '排水分区') {
     // a(properties);
 
     // if (Getproperties.value.c_layer.includes('雨水分区_1')) {
@@ -421,24 +405,17 @@
     return;
   }
 
-  let layerIdarr = [
-    "湖泊",
-    "湖泊_text",
-    "港渠",
-    "港渠_text",
-    "水库管理范围",
-    "水库管理范围_text",
-  ];
+  let layerIdarr = ['湖泊', '湖泊_text', '港渠', '港渠_text', '水库管理范围', '水库管理范围_text'];
   let newsetarr = [
-    { name: "湖泊", value: "lake_info" },
-    { name: "湖泊_text", value: "lake_info" },
-    { name: "港渠", value: "port_channel_info" },
-    { name: "港渠_text", value: "port_channel_info" },
-    { name: "水库管理范围", value: "reservoir_info" },
-    { name: "水库管理范围_text", value: "reservoir_info" },
+    { name: '湖泊', value: 'lake_info' },
+    { name: '湖泊_text', value: 'lake_info' },
+    { name: '港渠', value: 'port_channel_info' },
+    { name: '港渠_text', value: 'port_channel_info' },
+    { name: '水库管理范围', value: 'reservoir_info' },
+    { name: '水库管理范围_text', value: 'reservoir_info' },
   ];
   if (layerIdarr.includes(layerId)) {
-    type = newsetarr.find((item) => {
+    type = newsetarr.find(item => {
       return layerId == item.name;
     }).value;
 
@@ -447,15 +424,15 @@
     return;
   }
 
-  let arr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
+  let arr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
 
   if (arr.includes(layerId)) {
-    console.log("进了方法");
+    console.log('进了方法');
     pointandlineOpen(layerId);
     dialogConfig.dataCode = layerId;
-  } else if (properties.type && properties.type == "问题管线") {
-    pointandlineOpen("point");
-    dialogConfig.dataCode = "point";
+  } else if (properties.type && properties.type == '问题管线') {
+    pointandlineOpen('point');
+    dialogConfig.dataCode = 'point';
   } else {
     if (type) {
       GetBoxmenu(Name, type);
@@ -465,30 +442,27 @@
 
 // 根据类型处理接口返回的标注内容
 const AnnotationArr = ref([]);
-const StringName = ref("");
-const Annotation = (properties) => {
+const StringName = ref('');
+const Annotation = properties => {
   if (properties.siteData && properties.siteData.length) {
     let arr = JSON.parse(properties.siteData);
     AnnotationArr.value = arr;
-    console.log("数据", arr);
-    let string = "";
+    console.log('数据', arr);
+    let string = '';
 
     switch (properties.type) {
-      case "rain":
-        AnnotationArr.value = [
-          { valueName: "监测时间", value: properties.recordTime },
-          ...arr,
-        ];
+      case 'rain':
+        AnnotationArr.value = [{ valueName: '监测时间', value: properties.recordTime }, ...arr];
         break;
     }
     string = Methtion(string);
-    console.log("数据", string);
+    console.log('数据', string);
   }
 };
 
-const Methtion = (StringName) => {
+const Methtion = StringName => {
   if (AnnotationArr.value.length) {
-    AnnotationArr.value.map((item) => {
+    AnnotationArr.value.map(item => {
       StringName += `${item.valueName}:${item.value}+'/n' `;
     });
     return StringName;
@@ -505,7 +479,7 @@
     domElement.webkitRequestFullScreen();
   }
 };
-const closeFun = (is) => {
+const closeFun = is => {
   dialogConfig.visible = is;
 };
 function anotherMeht(item) {
@@ -516,10 +490,10 @@
   Getproperties.value.wellCode = item.wellCode || item.dataName || item.pipeLine;
   Getproperties.value.id = item.id;
   Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
-  Getproperties.value.dataId = item.dataId || "";
+  Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
-  Getproperties.value.geometry = item.geometry || item.geometrys || "";
+  Getproperties.value.geometry = item.geometry || item.geometrys || '';
   // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
   Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
@@ -529,7 +503,7 @@
   } else {
     Getproperties.value.daterange = null;
   }
-  console.log("Getproperties", Getproperties.value);
+  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
@@ -537,16 +511,22 @@
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
-  GetBoxmenu("", item.stType);
+  GetBoxmenu('', item.stType);
 }
 
 onMounted(() => {
   allScreen();
   useStore.getsewageData();
+<<<<<<< HEAD
   bus.on("DynamicBus", (item) => {
     // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
+=======
+  bus.on('DynamicBus', item => {
+    console.log('item', item);
+    dialogConfig.RefName = item.RefName || '';
+>>>>>>> 21295688f8eff8aa253cae9f64bf2ebc17a0a1fd
     dialogConfig.title = item.stName || item.name;
     // debugger;
     if (!!!item.NoPromise) {
@@ -559,24 +539,23 @@
       dialogConfig.dataID = item.pid ? item.pid : item.id;
       Getproperties.value.stCode = item.stCode;
       Getproperties.value.dataCode = item.dataCode;
-      Getproperties.value.wellcode =
-        item.wellCode || item.dataName || item.startPointNumber;
+      Getproperties.value.wellcode = item.wellCode || item.dataName || item.startPointNumber;
       Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
-      Getproperties.value.dataId = item.dataId || "";
+      Getproperties.value.dataId = item.dataId || '';
       Getproperties.value.stType = item.stType;
       Getproperties.value.geometry = item.geometry || item.geometrys;
       dialogConfig.visible = true;
     }
   });
-  bus.on("closedia", (e) => {
+  bus.on('closedia', e => {
     closediaMeth();
   });
-  bus.on("changeData", (e) => {
+  bus.on('changeData', e => {
     // switchArr();
   });
   // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
   // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
-  bus.on("xiaofeifei", (e) => {
+  bus.on('xiaofeifei', e => {
     // lngLat, properties = {}, layerId
 
     mapClick1(e.geometry.coordinates, e.properties, e.geometry.type);
@@ -584,18 +563,18 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("DynamicBus");
-  bus.off("closedia");
-  bus.off("changeData");
-  bus.off("xiaofeifei");
+  bus.off('DynamicBus');
+  bus.off('closedia');
+  bus.off('changeData');
+  bus.off('xiaofeifei');
 });
 </script>
 <style lang="scss">
-@import "@/assets/styles/pictureOnMap.scss";
+@import '@/assets/styles/pictureOnMap.scss';
 .pictureOnMap {
   width: 100%;
   height: 100%;
-  background: url("@/assets/images/pictureOnMap/maxBgc.png") no-repeat center;
+  background: url('@/assets/images/pictureOnMap/maxBgc.png') no-repeat center;
   background-size: 100% 100%;
   color: #fff;
   overflow: hidden;

diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index 2a6d65b..f94a395 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -534,9 +534,12 @@
     };
 
     const refreshGeoJSON = () => {
-      Object.keys(geojson).forEach(
-        (key) => map.getSource(key) && map.getSource(key).setData(geojson[key])
-      );
+      const cacheKeys = Object.keys(newfiberMap.map.style._sourceCaches);
+      Object.keys(geojson).forEach((key) => {
+        map.getSource(key) && map.getSource(key).setData(geojson[key]);
+        cacheKeys.filter(k => k.includes(key)).forEach(k => newfiberMap.map.style._sourceCaches[k].clearTiles());
+        console.log('refreshGeoJSON',cacheKeys.filter(k => k.includes(key)));
+      });
       map.triggerRepaint();
     };
 
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 5b05425..1df1977 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -351,19 +351,19 @@
     ({
       1: () => {
         !layerId && newfiberMap.map.easeTo(newfiberMap.config_.params.init);
-        [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][
+        [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][
           Number(isYS)
         ]();
       },
       2: () => {
-        [() => wsRouteToMapByName(properties), () => showOutletInfo(properties)][
+        [() => wsRouteToMapByName([properties]), () => showOutletInfo(properties)][
           Number(isYS)
         ]();
       },
       3: () => {
         [
           () => {
-            wsRouteToMapByName(properties);
+            wsRouteToMapByName([properties]);
           },
           () => {
             const _keys_ = [
@@ -427,85 +427,7 @@
       psfq.prevIds.push(properties);
   }
 
-  function wsRouteToMapByName(properties) {
-    const _keys_ = [
-      "污水系统流向1",
-      "污水系统流向",
-      "1_泵站",
-      "1_污水处理厂",
-      "sewage_pipeline_quality1",
-      "sewage_pump_station_info1",
-      "storage_tank_info1",
-    ];
-    _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
-    busEmit(removeMapDatas.key, _keys_);
-    let features = _.cloneDeep(
-      ws_routeGeoJSON.features.filter((i) =>
-        i.properties.bind.split(",").includes(properties.name)
-      )
-    );
-    let geojson = turf.featureCollection(
-      features.map((i) =>
-        Object.assign(i, {
-          properties: {
-            ...i.properties,
-            name: i.properties.name,
-            type: i.properties._type || "污水系统流向1",
-            color: "rgb(255,74,25)",
-            width: [0, 7, 5, 3][properties.level],
-          },
-        })
-      )
-    );
-    newfiberMap
-      .getLayers()
-      .filter((i) => i.newfiberId == _keys_[1])[0]
-      .setData(geojson);
-    busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] });
 
-    let [features_point, features_point1, features_point2] = [[], [], []];
-    let polygon = turf.flatten(Terraformer.WKT.parse(properties.geometry)).features[0];
-    if (["2", "3"].includes(properties.level)) {
-      let kk = _.replace(_keys_[4], /\d+/g, "");
-      features_point = _.cloneDeep(
-        newfiberMap.map
-          .getSource("point")
-          ._data.features.filter((i) => i.properties.type.includes(kk))
-          .filter((o) => turf.booleanPointInPolygon(o, polygon))
-      );
-      features_point1 = _.cloneDeep(
-        newfiberMap.map
-          .getSource("point")
-          ._data.features.filter((i) => _keys_[5].includes(i.properties.type))
-          .filter((o) => turf.booleanPointInPolygon(o, polygon))
-      );
-    }
-    features_point2 = _.cloneDeep(
-      newfiberMap.map
-        .getSource("point")
-        ._data.features.filter((i) => _keys_[6].includes(i.properties.type))
-        .filter((o) => turf.booleanPointInPolygon(o, polygon))
-    );
-    let geojson1 = turf.featureCollection(
-      [
-        ...features_point.map((i) => ({
-          ...i,
-          properties: { ...i.properties, type: _keys_[4] },
-        })),
-        ...features_point1.map((i) => ({
-          ...i,
-          properties: { ...i.properties, type: _keys_[5] },
-        })),
-        ...features_point2.map((i) => ({
-          ...i,
-          properties: { ...i.properties, type: _keys_[6] },
-        })),
-      ]
-        .flat()
-        .filter(Boolean)
-    );
-    busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] });
-  }
 
   function showOutletInfo(properties) {
     const key = "outlet_info";
@@ -647,6 +569,36 @@
   }
 };
 
+function wsRouteToMapByName(properties) {
+  const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
+  const _keys_ = ["污水系统流向1", "污水系统流向", "1_泵站", "1_污水处理厂", "sewage_pipeline_quality1", "sewage_pump_station_info1", "storage_tank_info1"];
+  _keys_.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
+  busEmit(removeMapDatas.key, _keys_);
+  if(!properties) properties = newfiberMap.map.getSource("hb_wh_dhgx_psfq_geometrys")._data.features.filter(i => i.properties.p_type == 'WS1').map(i => i.properties);
+  let geojson =  turf.featureCollection([]);
+  properties.forEach(p => {
+    let features = _.cloneDeep(ws_routeGeoJSON.features.filter((i) => i.properties.bind.split(",").includes(p.name)));
+    geojson.features = geojson.features.concat(features.map((i) => Object.assign(i, {properties: {...i.properties, name: i.properties.name, type: i.properties._type || "污水系统流向1", color: "rgb(255,74,25)", width: [0, 7, 5, 3][p.level]},})));
+    busEmit(setGeoJSON.key, { json: geojson, key: _keys_[0] });
+  })
+  newfiberMap.getLayers().filter((i) => i.newfiberId == _keys_[1])[0].setData(geojson);
+  if(properties.length != 1) return;
+  let [features_point, features_point1, features_point2] = [[], [], []];
+  let polygon = turf.flatten(Terraformer.WKT.parse(properties[0].geometry)).features[0];
+  if (["2", "3"].includes(properties[0].level)) {
+    let kk = _.replace(_keys_[4], /\d+/g, "");
+    features_point = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => i.properties.type.includes(kk)).filter((o) => turf.booleanPointInPolygon(o, polygon)));
+    features_point1 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[5].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon)));
+  }
+  features_point2 = _.cloneDeep(newfiberMap.map.getSource("point")._data.features.filter((i) => _keys_[6].includes(i.properties.type)).filter((o) => turf.booleanPointInPolygon(o, polygon)));
+  let geojson1 = turf.featureCollection([
+    ...features_point.map((i) => ({...i, properties: { ...i.properties, type: _keys_[4] },})),
+    ...features_point1.map((i) => ({...i, properties: { ...i.properties, type: _keys_[5] },})),
+    ...features_point2.map((i) => ({...i, properties: { ...i.properties, type: _keys_[6] },}))
+          ].flat().filter(Boolean)
+  );
+  busEmit(setGeoJSON.key, { json: geojson1, key: _keys_[4] });
+}
 function clearRouteMethod() {
   const { removeMapDatas } = events_params;
   const _keys = [
@@ -1172,6 +1124,7 @@
   trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap },
   clearTrajectory: { key: "clearTrajectory", method: clearTrajectory },
   clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData },
+  wsRouteToMapByName: { key: "wsRouteToMapByName", method: wsRouteToMapByName },
   load3DTiles: { key: "load3DTiles", method: load3DTiles },
   remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles },
   isOpenPanorama: {
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 9d1074a..7ddbafd 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -2,11 +2,7 @@
   <div class="pictureOnMap">
     <TopTab />
     <div class="mainContentBox">
-      <MapBox
-        :initJson="`/static/libs/mapbox/style/wh_dhgx.json`"
-        :loadCallback="loadCallback"
-        @mapClick1="mapClick1"
-      ></MapBox>
+      <MapBox :initJson="`/static/libs/mapbox/style/wh_dhgx.json`" :loadCallback="loadCallback" @mapClick1="mapClick1"></MapBox>
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
@@ -40,23 +36,23 @@
   </div>
 </template>
 <script setup>
-import { useRouter } from "vue-router";
+import { useRouter } from 'vue-router';
 
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { ref, reactive, onMounted, nextTick } from "vue";
-import TopTab from "./TopTab/index.vue";
-import MapBox from "../../components/Map/MapBox";
-import bus from "@/bus";
-import useUserStore from "@/store/modules/user";
-import DialogTabs from "@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue";
-import { drainageDispatchGetMenu } from "@/api/MonitorAssetsOnMap";
-import recordPage from "@/views/voice/recordPage/index";
-import usepartitionStore from "@/store/modules/partition";
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { ref, reactive, onMounted, nextTick } from 'vue';
+import TopTab from './TopTab/index.vue';
+import MapBox from '../../components/Map/MapBox';
+import bus from '@/bus';
+import useUserStore from '@/store/modules/user';
+import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
+import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import recordPage from '@/views/voice/recordPage/index';
+import usepartitionStore from '@/store/modules/partition';
 
-import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
-import inputSearch from "@/views/pictureOnMap/inputSearch.vue";
-import { FALSE } from "ol/functions";
+import LayerControl from '@/views/pictureOnMap/LayerControl.vue';
+import inputSearch from '@/views/pictureOnMap/inputSearch.vue';
+import { FALSE } from 'ol/functions';
 
 const useStore = usepartitionStore();
 const router = useRouter();
@@ -69,14 +65,14 @@
 const GetcomIDs = ref([]);
 const dialogConfig = reactive({
   visible: false,
-  dataID: "",
-  dataCode: "",
+  dataID: '',
+  dataCode: '',
   data: {},
   comIDs: [],
   customData: [],
-  RefName: "",
-  title: "详情",
-  typeName: "",
+  RefName: '',
+  title: '详情',
+  typeName: '',
 });
 const closediaMeth = () => {
   dialogConfig.visible = false;
@@ -84,47 +80,47 @@
 // 站点数组
 const arrstcode = ref([
   // 站点类型名称: 编码
-  "outlet_water_level", // 排口流量
-  "outlet_quality", // 排口水质
-  "channel_quality", // 港渠水质
-  "channel_water_level", // 港渠水位
-  "lake_water_level", // 湖泊水位
-  "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
-  "rain", // 雨量站
-  "rainwater_pipeline_quality", // 雨水管网水质
-  "sewage_pipeline_quality", // 污水管网水质
-  "rainwater_pipeline_quality_area", // 接驳口
-  "rainwater_pipeline_water_level", // 雨水管网液位
-  "reservoir_water_level", //水库水位
-  "rainPumpStation", //雨水泵站
-  "dirtyPumpStation", //污水泵站
-  "sewageStation", //污水厂
-  "gateStation", //闸门
-  "pump_water_level", //泵站液位
+  'outlet_water_level', // 排口流量
+  'outlet_quality', // 排口水质
+  'channel_quality', // 港渠水质
+  'channel_water_level', // 港渠水位
+  'lake_water_level', // 湖泊水位
+  'waterlogging', // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
+  'rain', // 雨量站
+  'rainwater_pipeline_quality', // 雨水管网水质
+  'sewage_pipeline_quality', // 污水管网水质
+  'rainwater_pipeline_quality_area', // 接驳口
+  'rainwater_pipeline_water_level', // 雨水管网液位
+  'reservoir_water_level', //水库水位
+  'rainPumpStation', //雨水泵站
+  'dirtyPumpStation', //污水泵站
+  'sewageStation', //污水厂
+  'gateStation', //闸门
+  'pump_water_level', //泵站液位
 ]);
 // 基本数据
 const arrid = ref([
-  "diversion_well_info", // 分流井
-  "drainage_info", // 排水户
-  "lake_info", // 湖泊
-  "outlet_info", // 排口
-  "port_channel_info", // 港渠
-  "rain_water_pump_station_info", // 雨水泵站
-  "region_info", // 分区信息
-  "reservoir_info", // 水库
-  "sewage_factory_info", // 污水处理厂
-  "sewage_factory_station_info", //污水处理站
-  "sewage_pump_station_info", // 污水泵站
-  "storage_tank_info", // 调蓄池
-  "water_gate_info", // 水闸
-  "waterlogging_point_info", // 渍水点
-  "water_region_info", // 水系汇水分区
-  "storehouse", //物资仓库
-  "dikeGood", //堤防备料
+  'diversion_well_info', // 分流井
+  'drainage_info', // 排水户
+  'lake_info', // 湖泊
+  'outlet_info', // 排口
+  'port_channel_info', // 港渠
+  'rain_water_pump_station_info', // 雨水泵站
+  'region_info', // 分区信息
+  'reservoir_info', // 水库
+  'sewage_factory_info', // 污水处理厂
+  'sewage_factory_station_info', //污水处理站
+  'sewage_pump_station_info', // 污水泵站
+  'storage_tank_info', // 调蓄池
+  'water_gate_info', // 水闸
+  'waterlogging_point_info', // 渍水点
+  'water_region_info', // 水系汇水分区
+  'storehouse', //物资仓库
+  'dikeGood', //堤防备料
 ]);
 // 基础数据
 const switchStcode = (Name, type) => {
-  if (type == "outlet_info") {
+  if (type == 'outlet_info') {
     pkClick(Getproperties.value);
   }
   console.log("GetcomIDs.value", GetcomIDs.value);
@@ -147,23 +143,19 @@
     dialogConfig.visible = true;
     dialogConfig.dataCode = type;
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.dataID = Getproperties.value.pid
-      ? Getproperties.value.pid
-      : Getproperties.value.id;
+    dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
   } else {
     return;
   }
 };
 // 类型弹框判断
-const typecodeswitch = (type) => {
+const typecodeswitch = type => {
   if (diabox[type]) {
     // console.log('diabox[type]', diabox[type]);
-    window[type + "_map"] = diabox[type]
-      .filter((i) => i.geometry)
+    window[type + '_map'] = diabox[type]
+      .filter(i => i.geometry)
       .map((item, index) => {
-        let coordinates = turf.getCoords(
-          turf.center(Terraformer.WKT.parse(item.geometry))
-        );
+        let coordinates = turf.getCoords(turf.center(Terraformer.WKT.parse(item.geometry)));
         const popup = new mapboxgl1.Popup({
           closeButton: false,
           closeOnClick: false,
@@ -177,7 +169,7 @@
       });
 
     nextTick(() => {
-      window[type + "_map"].forEach((i) => i._setOpacity(0));
+      window[type + '_map'].forEach(i => i._setOpacity(0));
     });
   }
 };
@@ -185,7 +177,7 @@
   let typearr = [];
   for (var k in diabox) {
     typearr.push(k);
-    appStore.MapData.map((item) => {
+    appStore.MapData.map(item => {
       if (item.pointType == k) {
         diabox[k] = item.data;
       }
@@ -210,53 +202,53 @@
   }
 };
 // 智慧水务大脑一张图 特定大屏动态菜单
-const specificFun = (type) => {
+const specificFun = type => {
   // 监测预警模块弹框
   // value值 统一菜单类型
   //name值 特指智慧水务大脑获取的动态菜单类型
   let arr = [
     {
-      name: "dp_zsfx", //渍水点
-      value: "waterlogging",
+      name: 'dp_zsfx', //渍水点
+      value: 'waterlogging',
     },
     {
-      name: "dp_hhsq", //河湖水情
-      value: "lake_water_level",
+      name: 'dp_hhsq', //河湖水情
+      value: 'lake_water_level',
     },
     {
-      name: "dp_bzgq", //泵站工情
-      value: "rainPumpStation", //雨水泵站
+      name: 'dp_bzgq', //泵站工情
+      value: 'rainPumpStation', //雨水泵站
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_water_level", //雨水管网液位
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_water_level', //雨水管网液位
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_gwfx", //接驳口
-      value: "rainwater_pipeline_quality_area", //接驳口
+      name: 'dp_gwfx', //接驳口
+      value: 'rainwater_pipeline_quality_area', //接驳口
     },
     {
-      name: "dp_wsgwfx", //大屏污水管网风险分析弹框
-      value: "sewage_pipeline_quality", //雨水管网水质
+      name: 'dp_wsgwfx', //大屏污水管网风险分析弹框
+      value: 'sewage_pipeline_quality', //雨水管网水质
     },
     // {
     //   name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
     //   value: "rainwater_pipeline_quality", //雨水管网水质
     // },
   ];
-  return arr.find((item) => item.value == type)?.name || null;
+  return arr.find(item => item.value == type)?.name || null;
 };
 
 // 获取动态弹框菜单
 const GetBoxmenu = (Name, type) => {
-  console.log("name", Name);
-  console.log("type", type);
+  console.log('name', Name);
+  console.log('type', type);
   GetcomIDs.value = [];
-  let dataId = "";
+  let dataId = '';
   if (arrstcode.value.includes(type)) {
     dataId = Getproperties.value.stCode;
   }
@@ -264,11 +256,11 @@
   if (arrid.value.includes(type)) {
     dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
   }
-  console.log("dataId", dataId);
+  console.log('dataId', dataId);
   if (!dataId) {
     //渍水调度
-    if (type == "waterlog_point") {
-      bus.emit("showZSdispatch", Getproperties.value);
+    if (type == 'waterlog_point') {
+      bus.emit('showZSdispatch', Getproperties.value);
     }
     // proxy.$modal.msgSuccess('');
     return;
@@ -276,15 +268,15 @@
   // debugger;
   let params = {
     dataCode: type,
-    scene: specificFun(type) || "basis_monitor",
+    scene: specificFun(type) || 'basis_monitor',
     // scene: "basis_monitor",
     dataId: dataId,
   };
-  drainageDispatchGetMenu(params).then((res) => {
-    console.log("获得的菜单", res.data);
+  drainageDispatchGetMenu(params).then(res => {
+    console.log('获得的菜单', res.data);
     Getmenuarr.value = res.data;
     if (res.data && res.data.length) {
-      res.data.map((item) => {
+      res.data.map(item => {
         GetcomIDs.value.push(item.moduleName);
       });
     }
@@ -299,113 +291,105 @@
 const pointandlineOpen = (type, properties) => {
   dialogConfig.visible = true;
   switch (type) {
-    case "pipeline_info_text":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info_text':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_info":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_point":
-      dialogConfig.title = "管点信息";
+    case 'pipeline_point':
+      dialogConfig.title = '管点信息';
       break;
-    case "point":
-      dialogConfig.title = "问题管线";
+    case 'point':
+      dialogConfig.title = '问题管线';
       break;
   }
 
   Getmenuarr.value = [
     {
-      menuName: "管网信息",
+      menuName: '管网信息',
       show: true,
-      moduleName: "PointAndLine",
+      moduleName: 'PointAndLine',
     },
   ];
   // debugger;
   // dialogConfig.dataID = '0371000003';
-  dialogConfig.comIDs = ["PointAndLine"];
-  dialogConfig.RefName = "PointAndLine";
+  dialogConfig.comIDs = ['PointAndLine'];
+  dialogConfig.RefName = 'PointAndLine';
 };
 const loadCallback = () => {};
 // 排口溯源
-const pkClick = async (properties) => {
+const pkClick = async properties => {
   // debugger;
   if (!properties.wellCode) return;
   let results = await upStreamAnalyse({ endPointNumber: properties.wellCode });
   let pipelines = results.data.pipelineInfoList
-    .map((i) =>
+    .map(i =>
       turf.feature(Terraformer.WKT.parse(i.geometrys), {
         ...i,
-        area: i.pipelineType == "Rain" ? "雨水" : "污水",
+        area: i.pipelineType == 'Rain' ? '雨水' : '污水',
       })
     )
-    .map((i) =>
-      i.properties.flowDirection == 0
-        ? turf.lineString(turf.getCoords(i).reverse(), i.properties)
-        : i
-    );
+    .map(i => (i.properties.flowDirection == 0 ? turf.lineString(turf.getCoords(i).reverse(), i.properties) : i));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "水系流向")[0]
+    .filter(i => i.newfiberId == '水系流向')[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 };
 
-const a = (properties) => {
-  const keys_ = ["雨水", "污水"];
-  const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-  bus.emit("removeMapDatas", keys);
+const a = properties => {
+  const keys_ = ['雨水', '污水'];
+  const keys = ['1_泵站', '1_污水处理厂', '分区流向', '分区流向1'];
+  bus.emit('removeMapDatas', keys);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection([]));
   const key = properties.c_layer.includes(keys_[0]) ? keys_[0] : keys_[1];
   const nameKey = properties.name.substring(0, 2);
-  let features = line.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.name.includes(nameKey)
-  );
-  let features1 = point.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.system.includes(nameKey)
-  );
-  let points = _.groupBy(features1, (a) => a.properties.type);
-  features.forEach((i) => {
+  let features = line.features.filter(i => i.properties.area.includes(key) && i.properties.name.includes(nameKey));
+  let features1 = point.features.filter(i => i.properties.area.includes(key) && i.properties.system.includes(nameKey));
+  let points = _.groupBy(features1, a => a.properties.type);
+  features.forEach(i => {
     i.properties.type = keys[2];
-    i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)";
+    i.properties.color = key == keys_[0] ? 'rgba(21,127,176,1)' : 'rgba(255,0,0,1)';
   });
-  Object.keys(points).map((key) =>
-    bus.emit("setGeoJSON", {
+  Object.keys(points).map(key =>
+    bus.emit('setGeoJSON', {
       json: turf.featureCollection(
-        points[key].map((i) => ({
+        points[key].map(i => ({
           type: i.type,
           geometry: i.geometry,
-          properties: { ...i.properties, type: "1_" + key },
+          properties: { ...i.properties, type: '1_' + key },
         }))
       ),
-      key: "1_" + key,
+      key: '1_' + key,
     })
   );
-  bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
+  bus.emit('setGeoJSON', { json: turf.featureCollection(features), key: keys[2] });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection(features));
 };
 
 const mapClick1 = (lngLat, properties = {}, layerId) => {
-  console.log("经纬度", lngLat);
-  console.log("数据", properties);
-  console.log("layerid", layerId);
+  console.log('经纬度', lngLat);
+  console.log('数据', properties);
+  console.log('layerid', layerId);
   dialogConfig.title = properties.stName || properties.name;
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : "" || 1;
-  let Name = properties ? properties.pointTypeName : "" || "";
+  let type = properties ? properties.type : '' || 1;
+  let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
-  console.log("1111", type, layerId);
+  console.log('1111', type, layerId);
 
-  if (properties.layer == "排水分区") {
+  if (properties.layer == '排水分区') {
     // a(properties);
 
     // if (Getproperties.value.c_layer.includes('雨水分区_1')) {
@@ -421,24 +405,17 @@
     return;
   }
 
-  let layerIdarr = [
-    "湖泊",
-    "湖泊_text",
-    "港渠",
-    "港渠_text",
-    "水库管理范围",
-    "水库管理范围_text",
-  ];
+  let layerIdarr = ['湖泊', '湖泊_text', '港渠', '港渠_text', '水库管理范围', '水库管理范围_text'];
   let newsetarr = [
-    { name: "湖泊", value: "lake_info" },
-    { name: "湖泊_text", value: "lake_info" },
-    { name: "港渠", value: "port_channel_info" },
-    { name: "港渠_text", value: "port_channel_info" },
-    { name: "水库管理范围", value: "reservoir_info" },
-    { name: "水库管理范围_text", value: "reservoir_info" },
+    { name: '湖泊', value: 'lake_info' },
+    { name: '湖泊_text', value: 'lake_info' },
+    { name: '港渠', value: 'port_channel_info' },
+    { name: '港渠_text', value: 'port_channel_info' },
+    { name: '水库管理范围', value: 'reservoir_info' },
+    { name: '水库管理范围_text', value: 'reservoir_info' },
   ];
   if (layerIdarr.includes(layerId)) {
-    type = newsetarr.find((item) => {
+    type = newsetarr.find(item => {
       return layerId == item.name;
     }).value;
 
@@ -447,15 +424,15 @@
     return;
   }
 
-  let arr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
+  let arr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
 
   if (arr.includes(layerId)) {
-    console.log("进了方法");
+    console.log('进了方法');
     pointandlineOpen(layerId);
     dialogConfig.dataCode = layerId;
-  } else if (properties.type && properties.type == "问题管线") {
-    pointandlineOpen("point");
-    dialogConfig.dataCode = "point";
+  } else if (properties.type && properties.type == '问题管线') {
+    pointandlineOpen('point');
+    dialogConfig.dataCode = 'point';
   } else {
     if (type) {
       GetBoxmenu(Name, type);
@@ -465,30 +442,27 @@
 
 // 根据类型处理接口返回的标注内容
 const AnnotationArr = ref([]);
-const StringName = ref("");
-const Annotation = (properties) => {
+const StringName = ref('');
+const Annotation = properties => {
   if (properties.siteData && properties.siteData.length) {
     let arr = JSON.parse(properties.siteData);
     AnnotationArr.value = arr;
-    console.log("数据", arr);
-    let string = "";
+    console.log('数据', arr);
+    let string = '';
 
     switch (properties.type) {
-      case "rain":
-        AnnotationArr.value = [
-          { valueName: "监测时间", value: properties.recordTime },
-          ...arr,
-        ];
+      case 'rain':
+        AnnotationArr.value = [{ valueName: '监测时间', value: properties.recordTime }, ...arr];
         break;
     }
     string = Methtion(string);
-    console.log("数据", string);
+    console.log('数据', string);
   }
 };
 
-const Methtion = (StringName) => {
+const Methtion = StringName => {
   if (AnnotationArr.value.length) {
-    AnnotationArr.value.map((item) => {
+    AnnotationArr.value.map(item => {
       StringName += `${item.valueName}:${item.value}+'/n' `;
     });
     return StringName;
@@ -505,7 +479,7 @@
     domElement.webkitRequestFullScreen();
   }
 };
-const closeFun = (is) => {
+const closeFun = is => {
   dialogConfig.visible = is;
 };
 function anotherMeht(item) {
@@ -516,10 +490,10 @@
   Getproperties.value.wellCode = item.wellCode || item.dataName || item.pipeLine;
   Getproperties.value.id = item.id;
   Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面
-  Getproperties.value.dataId = item.dataId || "";
+  Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
 
-  Getproperties.value.geometry = item.geometry || item.geometrys || "";
+  Getproperties.value.geometry = item.geometry || item.geometrys || '';
   // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
   Getproperties.value.waterRegionCode = item.lakeCode || item.waterRegionCode; //河湖水情  查询水系分区详情
@@ -529,7 +503,7 @@
   } else {
     Getproperties.value.daterange = null;
   }
-  console.log("Getproperties", Getproperties.value);
+  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
@@ -537,16 +511,22 @@
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
-  GetBoxmenu("", item.stType);
+  GetBoxmenu('', item.stType);
 }
 
 onMounted(() => {
   allScreen();
   useStore.getsewageData();
+<<<<<<< HEAD
   bus.on("DynamicBus", (item) => {
     // debugger;
     console.log("item", item);
     dialogConfig.RefName = item.RefName || "";
+=======
+  bus.on('DynamicBus', item => {
+    console.log('item', item);
+    dialogConfig.RefName = item.RefName || '';
+>>>>>>> 21295688f8eff8aa253cae9f64bf2ebc17a0a1fd
     dialogConfig.title = item.stName || item.name;
     // debugger;
     if (!!!item.NoPromise) {
@@ -559,24 +539,23 @@
       dialogConfig.dataID = item.pid ? item.pid : item.id;
       Getproperties.value.stCode = item.stCode;
       Getproperties.value.dataCode = item.dataCode;
-      Getproperties.value.wellcode =
-        item.wellCode || item.dataName || item.startPointNumber;
+      Getproperties.value.wellcode = item.wellCode || item.dataName || item.startPointNumber;
       Getproperties.value.id = item.relationId || item.id; //item.relationId监测告警的普通id
-      Getproperties.value.dataId = item.dataId || "";
+      Getproperties.value.dataId = item.dataId || '';
       Getproperties.value.stType = item.stType;
       Getproperties.value.geometry = item.geometry || item.geometrys;
       dialogConfig.visible = true;
     }
   });
-  bus.on("closedia", (e) => {
+  bus.on('closedia', e => {
     closediaMeth();
   });
-  bus.on("changeData", (e) => {
+  bus.on('changeData', e => {
     // switchArr();
   });
   // 部分公共弹窗需要使用一个查询时间,目前不确定后期有没有人使用同类型的弹窗,在此初始化,增加公共弹窗的兼容性
   // localStorage.setItem("JCFXDialogTimer", moment().format("YYYY-MM-DD"));
-  bus.on("xiaofeifei", (e) => {
+  bus.on('xiaofeifei', e => {
     // lngLat, properties = {}, layerId
 
     mapClick1(e.geometry.coordinates, e.properties, e.geometry.type);
@@ -584,18 +563,18 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("DynamicBus");
-  bus.off("closedia");
-  bus.off("changeData");
-  bus.off("xiaofeifei");
+  bus.off('DynamicBus');
+  bus.off('closedia');
+  bus.off('changeData');
+  bus.off('xiaofeifei');
 });
 </script>
 <style lang="scss">
-@import "@/assets/styles/pictureOnMap.scss";
+@import '@/assets/styles/pictureOnMap.scss';
 .pictureOnMap {
   width: 100%;
   height: 100%;
-  background: url("@/assets/images/pictureOnMap/maxBgc.png") no-repeat center;
+  background: url('@/assets/images/pictureOnMap/maxBgc.png') no-repeat center;
   background-size: 100% 100%;
   color: #fff;
   overflow: hidden;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/index.vue b/src/views/pictureOnMap/page/DrainageSystem/index.vue
index 888c213..9d843ea 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/index.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/index.vue
@@ -32,7 +32,8 @@
         { key: "newfiber-XYZLayer", visible: true },
         { key: "高清地图", visible: true },
         { key: '污水系统流向1', visible: false },
-        { key: '污水系统流向', visible: false }
+        { key: '污水系统流向', visible: false },
+        { key: '1_污水处理厂', visible: false }
       ],
     },
     {
@@ -57,33 +58,22 @@
   AllData.TypeID = item.key;
 };
 const TypeClick_ = (item) => {
+  const { setLayerVisible, clearTemporaryData,wsRouteToMapByName } = events_params;
   closeAllLayer();
-  bus.emit("clearTemporaryData");
-  const { setLayerVisible } = events_params;
+  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.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" },
   setLayerVisible: { key: "setLayerVisible" },
   clearTemporaryData: { key: "clearTemporaryData" },
+  wsRouteToMapByName: { key: "wsRouteToMapByName" },
 };
 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, []);
 };