diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 384f16e..3303742 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -1,11 +1,5 @@
 <template>
-  <MapBox
-    :initJson="props.initJson"
-    :loadCallback="getModalData"
-    @map-click="mapClickEvt"
-    v-show="MapShow"
-  >
-  </MapBox>
+  <MapBox :initJson="props.initJson" :loadCallback="getModalData" @map-click="mapClickEvt" v-show="MapShow"> </MapBox>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -13,29 +7,29 @@
 </template>
 
 <script setup name="Map">
-import bus from "@/bus";
-import request from "@/utils/request";
-import MapBox from "@/components/Map/Map";
-import { getBaseListPoint } from "@/api/MonitorAssetsOnMap";
-import { supervisionRealinformationList } from "@/api/internetVehicles";
-import useUserStore from "@/store/modules/user";
-import { reactive, onMounted, onBeforeUnmount, nextTick, defineProps, watch } from "vue";
-import streetSpace from "@/components/Map/streetSpace";
-import gq_line from "../../../public/static/libs/mapbox/json/gq_line.json";
-import ys_flow from "../../../public/static/libs/mapbox/json/ys_flow.json";
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { MapboxOverlay } from "@deck.gl/mapbox";
-import { LineLayer, GeoJsonLayer } from "@deck.gl/layers";
-import { TripsLayer, Tile3DLayer } from "@deck.gl/geo-layers";
-import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
+import bus from '@/bus';
+import request from '@/utils/request';
+import MapBox from '@/components/Map/Map';
+import { getBaseListPoint } from '@/api/MonitorAssetsOnMap';
+import { supervisionRealinformationList } from '@/api/internetVehicles';
+import useUserStore from '@/store/modules/user';
+import { reactive, onMounted, onBeforeUnmount, nextTick, defineProps, watch } from 'vue';
+import streetSpace from '@/components/Map/streetSpace';
+import gq_line from '../../../public/static/libs/mapbox/json/gq_line.json';
+import ys_flow from '../../../public/static/libs/mapbox/json/ys_flow.json';
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { MapboxOverlay } from '@deck.gl/mapbox';
+import { LineLayer, GeoJsonLayer } from '@deck.gl/layers';
+import { TripsLayer, Tile3DLayer } from '@deck.gl/geo-layers';
+import { Tiles3DLoader } from '@loaders.gl/3d-tiles';
 const appStore = useUserStore();
 const MapShow = ref(true);
 const props = defineProps({
   // 数据id
   initJson: {
     type: String,
-    default: () => "/static/libs/mapbox/style/wh_dhgx.json",
+    default: () => '/static/libs/mapbox/style/wh_dhgx.json',
   },
   loadCallback: {
     type: Function,
@@ -50,77 +44,77 @@
 const refreshTimer = ref(null);
 const default_params = {
   point: {
-    key: "point",
+    key: 'point',
     prevId: null,
   },
   sx_wn_hm_monitoring: {
-    key: "sx_wn_hm_monitoring",
+    key: 'sx_wn_hm_monitoring',
     prevId: null,
   },
   town: {
-    key: "乡镇",
-    c_key: "村",
+    key: '乡镇',
+    c_key: '村',
     prevId: null,
   },
   hupo: {
-    key: "湖泊",
+    key: '湖泊',
     prevId: null,
   },
   gangqu: {
-    key: "港渠",
+    key: '港渠',
     prevId: null,
   },
   hb_wh_dhgx_merge: {
-    key: "hb_wh_dhgx_merge",
+    key: 'hb_wh_dhgx_merge',
     children: {
-      psfq: { key: "排水分区" },
+      psfq: { key: '排水分区' },
     },
     prevId: null,
   },
-  海绵型水系: { color: "rgba(35,184,153,1)" },
-  海绵建筑与社区: { color: "rgba(255,119,125,1)" },
-  海绵型道路广场: { color: "rgba(255,152,4,1)" },
-  管网及泵站: { color: "rgba(0,153,68,1)" },
-  海绵型公园绿地: { color: "rgba(223,214,20,1)" },
-  flow: { color: "rgba(255,255,255,1)" },
-  rain: { color: "rgba(255,255,255,1)" },
+  海绵型水系: { color: 'rgba(35,184,153,1)' },
+  海绵建筑与社区: { color: 'rgba(255,119,125,1)' },
+  海绵型道路广场: { color: 'rgba(255,152,4,1)' },
+  管网及泵站: { color: 'rgba(0,153,68,1)' },
+  海绵型公园绿地: { color: 'rgba(223,214,20,1)' },
+  flow: { color: 'rgba(255,255,255,1)' },
+  rain: { color: 'rgba(255,255,255,1)' },
 
-  water_level: { color: "rgba(255,255,255,1)" },
-  waterlogging: { color: "rgba(255,255,255,1)" },
+  water_level: { color: 'rgba(255,255,255,1)' },
+  waterlogging: { color: 'rgba(255,255,255,1)' },
 
-  rain_bz: { color: "rgba(255,255,255,1)" },
-  sxt: { color: "rgba(255,255,255,1)" },
-  WSCLC: { color: "rgba(255,255,255,1)" },
-  overflow_outfall: { color: "rgba(255,255,255,1)" },
+  rain_bz: { color: 'rgba(255,255,255,1)' },
+  sxt: { color: 'rgba(255,255,255,1)' },
+  WSCLC: { color: 'rgba(255,255,255,1)' },
+  overflow_outfall: { color: 'rgba(255,255,255,1)' },
 
-  rainfall: { color: "rgba(223,214,20,1)" },
-  pipeline: { color: "rgba(223,214,20,1)" },
-  drain_outlet: { color: "rgba(223,214,20,1)" },
+  rainfall: { color: 'rgba(223,214,20,1)' },
+  pipeline: { color: 'rgba(223,214,20,1)' },
+  drain_outlet: { color: 'rgba(223,214,20,1)' },
 };
-window.mapInitBusName = "mapInitBusName";
+window.mapInitBusName = 'mapInitBusName';
 const mapClickEvt = (lngLat, properties, layerId) => {
   datas.isOpenPanorama &&
     (() => {
-      setPopupDom("proxy.$refs.streetSpace1", 2);
+      setPopupDom('proxy.$refs.streetSpace1', 2);
       newfiberMap.popup1.setLngLat(lngLat).addTo(newfiberMap.map);
       datas.location = lngLat;
     })();
 
-  console.log("properties", properties, layerId);
+  console.log('properties', properties, layerId);
   // 图层点击事件
-  if (properties) bus.emit("FenQuClick", properties);
+  if (properties) bus.emit('FenQuClick', properties);
   clearTrajectory();
   clearTemporaryData();
-  proxy.$emit("map-click1", lngLat, properties, layerId);
+  proxy.$emit('map-click1', lngLat, properties, layerId);
   const { town, hupo, gangqu, hb_wh_dhgx_merge } = default_params;
   const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
-  const _keys = ["rain_water_pump_station_info", "sewage_pump_station_info"];
+  const _keys = ['rain_water_pump_station_info', 'sewage_pump_station_info'];
 
   (() => {
     setHighlight_(properties);
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == "村域边界")[0]
+      .filter(i => i.newfiberId == '村域边界')[0]
       .setData(turf.featureCollection([]));
     if (town.prevId) {
       busEmit(setLayerVisible.key, { layername: town.key, isCheck: true });
@@ -129,20 +123,18 @@
     }
     busEmit(
       removeMapDatas.key,
-      _keys.map((k) => k + 1)
+      _keys.map(k => k + 1)
     );
   })();
-  ((
-    {
+  (
+    ({
       [town.key]: () => {
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == "村域边界")[0]
+          .filter(i => i.newfiberId == '村域边界')[0]
           .setData(
             turf.featureCollection(
-              newfiberMap.map
-                .getSource("hb_wh_gxq_cun2")
-                ._data.features.filter((i) => i.properties.type == properties.name)
+              newfiberMap.map.getSource('hb_wh_gxq_cun2')._data.features.filter(i => i.properties.type == properties.name)
             )
           );
         busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
@@ -154,38 +146,30 @@
           busEmit(setLayerVisible.key, {
             layername: hupo.prevId,
             isCheck: false,
-            values: [hupo.prevId, ["严东湖", "严西湖"].join(",")],
+            values: [hupo.prevId, ['严东湖', '严西湖'].join(',')],
           });
           hupo.prevId = null;
-          bus.emit("removeMapDatas", ["outlet_info1"]);
+          bus.emit('removeMapDatas', ['outlet_info1']);
         }
-        const keys = ["outlet_info", "村域边界", "lake"];
-        const specialKeys = ["严东湖", "严西湖"];
+        const keys = ['outlet_info', '村域边界', 'lake'];
+        const specialKeys = ['严东湖', '严西湖'];
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == keys[1])[0]
-          .setData(
-            turf.featureCollection(
-              gq_line.features.filter((i) => i.properties.w_id == properties.name)
-            )
-          );
+          .filter(i => i.newfiberId == keys[1])[0]
+          .setData(turf.featureCollection(gq_line.features.filter(i => i.properties.w_id == properties.name)));
         let features = newfiberMap.map
-          .getSource("point")
+          .getSource('point')
           ._data.features.filter(
-            (i) =>
-              i.properties.type == keys[0] &&
-              i.properties.waterBodyType == keys[2] &&
-              i.properties.waterBodyId == properties.pid
+            i =>
+              i.properties.type == keys[0] && i.properties.waterBodyType == keys[2] && i.properties.waterBodyId == properties.pid
           )
-          .map((i) => _.cloneDeep(i));
-        features.forEach((i) => (i.properties.type = i.properties.type + "1"));
+          .map(i => _.cloneDeep(i));
+        features.forEach(i => (i.properties.type = i.properties.type + '1'));
         busEmit(events_params.setGeoJSON.key, {
           json: turf.featureCollection(features),
           key: keys[0] + 1,
         });
-        const values = [
-          specialKeys.includes(properties.name) ? specialKeys.join(",") : properties.name,
-        ];
+        const values = [specialKeys.includes(properties.name) ? specialKeys.join(',') : properties.name];
         busEmit(setLayerVisible.key, {
           layername: properties.name,
           isCheck: true,
@@ -196,27 +180,21 @@
       [gangqu.key]: () => {
         if (gangqu.prevId) {
           gangqu.prevId = null;
-          bus.emit("removeMapDatas", ["outlet_info1"]);
+          bus.emit('removeMapDatas', ['outlet_info1']);
         }
-        const keys = ["outlet_info", "村域边界", "channel"];
+        const keys = ['outlet_info', '村域边界', 'channel'];
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == keys[1])[0]
-          .setData(
-            turf.featureCollection(
-              gq_line.features.filter((i) => i.properties.name == properties.name)
-            )
-          );
+          .filter(i => i.newfiberId == keys[1])[0]
+          .setData(turf.featureCollection(gq_line.features.filter(i => i.properties.name == properties.name)));
         let features = newfiberMap.map
-          .getSource("point")
+          .getSource('point')
           ._data.features.filter(
-            (i) =>
-              i.properties.type == keys[0] &&
-              i.properties.waterBodyType == keys[2] &&
-              i.properties.waterBodyId == properties.pid
+            i =>
+              i.properties.type == keys[0] && i.properties.waterBodyType == keys[2] && i.properties.waterBodyId == properties.pid
           )
-          .map((i) => _.cloneDeep(i));
-        features.forEach((i) => (i.properties.type = i.properties.type + "1"));
+          .map(i => _.cloneDeep(i));
+        features.forEach(i => (i.properties.type = i.properties.type + '1'));
         busEmit(events_params.setGeoJSON.key, {
           json: turf.featureCollection(features),
           key: keys[0] + 1,
@@ -225,75 +203,59 @@
       },
       [hb_wh_dhgx_merge.key]: () => {
         if (properties.layer == hb_wh_dhgx_merge.children.psfq.key) {
-          const layerSplit = properties.c_layer.split("_");
+          const layerSplit = properties.c_layer.split('_');
           let geometry = Terraformer.WKT.parse(properties.geometry);
 
           busEmit(setHighlight.key, []);
-          const type = _.chunk(layerSplit[1], 2)[0].join("");
-          let pType = type == "雨水" ? "YS" : "WS";
-          pType == "YS" ? ys_flow(properties, true) : ws_flow(properties);
+          const type = _.chunk(layerSplit[1], 2)[0].join('');
+          let pType = type == '雨水' ? 'YS' : 'WS';
+          pType == 'YS' ? ys_flow(properties, true) : ws_flow(properties);
           if (layerSplit[2] != 3) return mapCenterByData(turf.bbox(geometry));
           let features = newfiberMap.map
-            .getSource("hb_wh_dhgx_pipe_line_n_y_w")
-            ._data.features.filter(
-              (i) =>
-                i.properties[type + "系统"] == properties.name &&
-                i.properties["管段类型"] == pType
-            );
+            .getSource('hb_wh_dhgx_pipe_line_n_y_w')
+            ._data.features.filter(i => i.properties[type + '系统'] == properties.name && i.properties['管段类型'] == pType);
           let pFeatures = newfiberMap.map
-            .getSource("point")
-            ._data.features.filter(
-              (i) =>
-                _keys.includes(i.properties.type) &&
-                (i.properties.pointTypeName || "").includes(type)
-            );
-          let p_features = turf.pointsWithinPolygon(
-            turf.featureCollection(pFeatures),
-            geometry
-          );
-          p_features.features.forEach((i) => (i.properties.type = i.properties.type + 1));
+            .getSource('point')
+            ._data.features.filter(i => _keys.includes(i.properties.type) && (i.properties.pointTypeName || '').includes(type));
+          let p_features = turf.pointsWithinPolygon(turf.featureCollection(pFeatures), geometry);
+          p_features.features.forEach(i => (i.properties.type = i.properties.type + 1));
           busEmit(setGeoJSON.key, { json: p_features });
-          console.log("features", p_features, pFeatures);
-          busEmit(
-            setHighlight.key,
-            turf.flatten(turf.featureCollection(features)).features
-          );
+          console.log('features', p_features, pFeatures);
+          busEmit(setHighlight.key, turf.flatten(turf.featureCollection(features)).features);
         }
       },
-    }[layerId] ||
+    })[layerId] ||
     function () {
       //newfiberMap.map.easeTo(newfiberMap.config_.params.init);
     }
-  )());
+  )();
 
   function ys_flow(properties, visible) {
-    const keys = ["雨水系统流向", "雨水系统流向1"];
-    keys.forEach((key) =>
-      busEmit(setLayerVisible.key, { layername: key, isCheck: visible })
-    );
+    const keys = ['雨水系统流向', '雨水系统流向1'];
+    keys.forEach(key => busEmit(setLayerVisible.key, { layername: key, isCheck: visible }));
     setHighlight_(properties);
   }
 
   function ws_flow(properties) {
-    const keys_ = ["雨水", "污水"];
-    const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-    bus.emit("removeMapDatas", keys);
+    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([]));
-    let key = (properties.c_layer || "").includes(keys_[0]) ? keys_[0] : keys_[1];
+    let key = (properties.c_layer || '').includes(keys_[0]) ? keys_[0] : keys_[1];
     if (properties.pointTypeName) key = keys_[1];
-    const nameKey = "龙王咀" || properties.name.substring(0, 2);
-    let features = line.features.filter((i) => i.properties.area.includes(key));
+    const nameKey = '龙王咀' || properties.name.substring(0, 2);
+    let features = line.features.filter(i => i.properties.area.includes(key));
     // let features1 = point.features.filter(i => i.properties.type.includes(key) );
-    let points = _.groupBy(point.features, (a) => a.properties.type);
-    features.forEach((i) => {
+    let points = _.groupBy(point.features, 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) =>
+    /*    Object.keys(points).map((key) =>
       bus.emit("setGeoJSON", {
         json: turf.featureCollection(
           points[key].map((i) => ({
@@ -306,7 +268,7 @@
       })
     );*/
     // bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
-  /*  newfiberMap
+    /*  newfiberMap
       .getLayers()
       .filter((i) => i.newfiberId == keys[3])[0]
       .getSource()
@@ -316,18 +278,16 @@
 };
 
 function setHighlight_(properties = {}) {
-  const temporary = "temporary";
-  bus.emit("removeMapDatas", [temporary]);
+  const temporary = 'temporary';
+  bus.emit('removeMapDatas', [temporary]);
   if (!properties.geometry) return;
   let geojson = turf.polygonToLine(Terraformer.WKT.parse(properties.geometry));
   geojson = geojson.features ? geojson : turf.featureCollection([geojson]);
-  geojson.features.forEach(
-    (i) => (i.properties = { color: "rgba(255,255,0,1)", type: temporary })
-  );
-  bus.emit("setGeoJSON", { json: geojson, key: temporary });
+  geojson.features.forEach(i => (i.properties = { color: 'rgba(255,255,0,1)', type: temporary }));
+  bus.emit('setGeoJSON', { json: geojson, key: temporary });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "村域边界")[0]
+    .filter(i => i.newfiberId == '村域边界')[0]
     .setData(geojson);
 }
 
@@ -335,8 +295,8 @@
   isClockInRange();
   const { setLayerVisible, setHighlight } = events_params;
   Object.keys(events_params)
-    .filter((key) => events_params[key].method)
-    .forEach((key) => busOn(events_params[key].key, events_params[key].method));
+    .filter(key => events_params[key].method)
+    .forEach(key => busOn(events_params[key].key, events_params[key].method));
   // 获取地图项目数据
   dataToMap({});
   //5分钟刷新一次实时数据1000 * 60 * 5)
@@ -345,29 +305,27 @@
   }, 1000 * 60 * 5);*/
   createPopup();
   busEmit(events_params.closeAllLayer.key);
-  proxy.$emit("loadCallback");
+  proxy.$emit('loadCallback');
   ww();
   ysFlow();
 };
 
 const ysFlow = () => {
-  const key = "雨水系统流向";
+  const key = '雨水系统流向';
   // let features = line.features.filter(i => key.includes(i.properties.area));
   // ys_flow.features = ys_flow.features.concat(features).map(i => ({ ...i, properties: { ...i.properties, color: 'rgba(49,254,223,1)', name: undefined } }));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == key)[0]
+    .filter(i => i.newfiberId == key)[0]
     .setData(ys_flow);
   busEmit(events_params.setGeoJSON.key, { json: ys_flow, key: key + 1 });
 };
 
 const ww = () => {
-  const keys = ["尾水路径"];
+  const keys = ['尾水路径'];
   let features = newfiberMap.map
-    .getSource("hb_wh_dhgx_merge")
-    ._data.features.filter(
-      (i) => i.properties.c_layer.includes(keys[0]) && i.properties.geometry_type == 2
-    );
+    .getSource('hb_wh_dhgx_merge')
+    ._data.features.filter(i => i.properties.c_layer.includes(keys[0]) && i.properties.geometry_type == 2);
   busEmit(events_params.setGeoJSON.key, {
     json: turf.featureCollection(features),
     key: keys[0],
@@ -375,33 +333,29 @@
 };
 
 let prevObj = null;
-const panelDataToMap = (obj) => {
+const panelDataToMap = obj => {
   // debugger
   const { setLayerVisible, setHighlight } = events_params;
   // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false });
   busEmit(setHighlight.key, []);
   // busEmit(setLayerVisible.key, { layername: obj.type, isCheck: true });
   // debugger;
-  let features = ["point", "linestring", "polygon", "hb_wh_dhgx_merge"]
-    .map((key) =>
+  let features = ['point', 'linestring', 'polygon', 'hb_wh_dhgx_merge']
+    .map(key =>
       newfiberMap.map
         .getSource(key)
         ._options.data.features.filter(
-          (i) =>
-            (i.properties.name || "").includes(obj.name) &&
-            (obj.id ? obj.id == i.properties.pid : true)
+          i => (i.properties.name || '').includes(obj.name) && (obj.id ? obj.id == i.properties.pid : true)
         )
     )
     .flat();
-  let feature =
-    features.filter((i) => i.properties.name == obj.name)[0] ||
-    features[_.random(0, features.length - 1)];
+  let feature = features.filter(i => i.properties.name == obj.name)[0] || features[_.random(0, features.length - 1)];
   if (!feature) return;
   busEmit(setHighlight.key, [feature]);
   mapCenterByData(turf.bbox(feature));
 };
 
-const mapCenterByData = (bbox) => {
+const mapCenterByData = bbox => {
   newfiberMap.map.fitBounds(
     [
       [bbox[0], bbox[1]],
@@ -410,29 +364,24 @@
     { padding: 50, offset: [100, 10], maxZoom: 18, pitch: 0, duration: 500 }
   );
 };
-const trajectoryToMap = (data) => {
+const trajectoryToMap = data => {
   clearTrajectory();
-  const fields = { lng: "l", lat: "a" };
-  mapCenterByData([data[0]["l"], data[0]["a"], data[1]["l"], data[1]["a"]].map(Number));
-  newfiberMap.map.trackLayer = new mapboxgl1.TrackLayer(
-    newfiberMap.map,
-    data,
-    fields,
-    (properties, index) => {
-      const lng = properties[fields.lng];
-      const lat = properties[fields.lat];
-      if (!(index % 50)) {
-        newfiberMap.map.flyTo({
-          center: [lng, lat],
-          bearing: newfiberMap.map.getBearing(),
-          pitch: newfiberMap.map.getPitch(),
-          zoom: newfiberMap.map.getZoom(),
-        });
-      }
-      /*        setPopupDom('proxy.$refs.trajectory', 1);
-                            newfiberMap.popup.setLngLat([lng,lat]).addTo(newfiberMap.map);*/
+  const fields = { lng: 'l', lat: 'a' };
+  mapCenterByData([data[0]['l'], data[0]['a'], data[1]['l'], data[1]['a']].map(Number));
+  newfiberMap.map.trackLayer = new mapboxgl1.TrackLayer(newfiberMap.map, data, fields, (properties, index) => {
+    const lng = properties[fields.lng];
+    const lat = properties[fields.lat];
+    if (!(index % 50)) {
+      newfiberMap.map.flyTo({
+        center: [lng, lat],
+        bearing: newfiberMap.map.getBearing(),
+        pitch: newfiberMap.map.getPitch(),
+        zoom: newfiberMap.map.getZoom(),
+      });
     }
-  );
+    /*        setPopupDom('proxy.$refs.trajectory', 1);
+                            newfiberMap.popup.setLngLat([lng,lat]).addTo(newfiberMap.map);*/
+  });
 };
 
 const clearTrajectory = () => {
@@ -445,47 +394,47 @@
   const data_default_params = {
     sites: {
       method: getBaseListPoint,
-      fields: { geometry: "geometry", name: "name" },
-      groupMethod: (data) =>
+      fields: { geometry: 'geometry', name: 'name' },
+      groupMethod: data =>
         _.groupBy(
           data
-            .map((i) => i.data)
+            .map(i => i.data)
             .flat()
-            .filter((i) => i.geometry)
-            .map((item) => ({ ...item })),
-          (v) => v.pointType + (v.connectType ? "_" + v.connectType : "")
+            .filter(i => i.geometry)
+            .map(item => ({ ...item })),
+          v => v.pointType + (v.connectType ? '_' + v.connectType : '')
         ),
     },
     //车辆
     cheliang: {
       method: supervisionRealinformationList,
-      fields: { lng: "longitude", lat: "latitude", name: "plateNumber" },
-      groupMethod: (data) =>
+      fields: { lng: 'longitude', lat: 'latitude', name: 'plateNumber' },
+      groupMethod: data =>
         _.groupBy(
           data.supervisionRealinformationList
-            .filter((i) => i.longitude && i.latitude)
-            .map((item) => ({ ...item, type: item.vehicleCategory + item.status })),
-          (v) => v.type
+            .filter(i => i.longitude && i.latitude)
+            .map(item => ({ ...item, type: item.vehicleCategory + item.status })),
+          v => v.type
         ),
     },
   };
   let keys = Object.keys(params || data_default_params);
   const results = await Promise.all(
-    keys.map((k, idx) =>
-      data_default_params[k].method((params || {})[k] || data_default_params[k].mPrams)
-    )
+    keys.map((k, idx) => data_default_params[k].method((params || {})[k] || data_default_params[k].mPrams))
   );
   results.forEach((result, idx) => {
     const data = result.data;
     const k = keys[idx];
     if (!data) return;
-    bus.emit("changeData");
+    const filteredData = filterGeometryNotEmpty(data);
+    appStore.SET_MapData(filteredData);
+    bus.emit('changeData');
     const groups = data_default_params[k].groupMethod(data);
     const g_keys = Object.keys(groups);
-    bus.emit("removeMapDatas", g_keys);
-    g_keys.forEach((key) =>
+    bus.emit('removeMapDatas', g_keys);
+    g_keys.forEach(key =>
       busEmit(beansToMap.key, {
-        beans: groups[key].map((i) => ({
+        beans: groups[key].map(i => ({
           ...i,
           color: (default_params[key] || {}).color,
         })),
@@ -513,16 +462,16 @@
   f();
   nextTick(f);
   function f() {
-    console.log("eval(dom)", eval(dom));
+    console.log('eval(dom)', eval(dom));
     newfiberMap.popup1.setDOMContent(eval(dom));
     newfiberMap.popup1.setOffset(offset);
   }
 };
 
 function filterGeometryNotEmpty(inputData) {
-  return inputData.map((item) => {
+  return inputData.map(item => {
     // 过滤掉每个对象中的 data 数组里 geometry 为空的元素
-    const filteredData = item.data.filter((dataPoint) => dataPoint.geometry !== "");
+    const filteredData = item.data.filter(dataPoint => dataPoint.geometry !== '');
     return {
       ...item,
       data: filteredData,
@@ -531,29 +480,24 @@
 }
 
 //路径规划
-const pathPlanning = async (
-  origin = "116.481028,39.989643",
-  destination = "116.465302,40.004717",
-  callback
-) => {
-  const origin_ = origin.split(",").map(Number);
-  const destination_ = destination.split(",").map(Number);
-  if (origin_.length != 2 || destination_.length != 2)
-    return console.log("输入参数错误：", origin, destination);
+const pathPlanning = async (origin = '116.481028,39.989643', destination = '116.465302,40.004717', callback) => {
+  const origin_ = origin.split(',').map(Number);
+  const destination_ = destination.split(',').map(Number);
+  if (origin_.length != 2 || destination_.length != 2) return console.log('输入参数错误：', origin, destination);
   const results = await request(
     `/amap/v3/direction/driving?origin=${origin}&destination=${destination}&extensions=all&output=json&key=74f1b47f7fea1971354edb2dfacb3982`
   );
-  if (!results.route.paths[0]) return console.log("暂无路径！");
+  if (!results.route.paths[0]) return console.log('暂无路径！');
   callback &&
     callback(
       turf.featureCollection(
-        results.route.paths[0].steps.map((i) =>
+        results.route.paths[0].steps.map(i =>
           turf.feature(
             Terraformer.WKT.parse(
               `LINESTRING(${i.polyline
-                .split(";")
-                .map((i) => i.split(",").join(" "))
-                .join(",")})`
+                .split(';')
+                .map(i => i.split(',').join(' '))
+                .join(',')})`
             ),
             i
           )
@@ -564,19 +508,19 @@
 
 //判断是否在打卡点内
 const isClockInRange = (
-  currentLocation = "POINT(109.41360117253636 34.49038724464877)",
+  currentLocation = 'POINT(109.41360117253636 34.49038724464877)',
   ranges = [
-    "POINT(109.43167853335872 34.51345940211415)",
-    "POINT(109.46797592891363 34.51145239795833)",
-    "POINT(109.44903576574815 34.50165755773118)",
+    'POINT(109.43167853335872 34.51345940211415)',
+    'POINT(109.46797592891363 34.51145239795833)',
+    'POINT(109.44903576574815 34.50165755773118)',
   ],
   rVal = 500
 ) => {
   const feature = { ...Terraformer.WKT.parse(currentLocation) };
   return (
     ranges
-      .map((i) => turf.buffer({ ...Terraformer.WKT.parse(i) }, rVal / 1000))
-      .map((i) => turf.booleanContains(i, feature))
+      .map(i => turf.buffer({ ...Terraformer.WKT.parse(i) }, rVal / 1000))
+      .map(i => turf.booleanContains(i, feature))
       .filter(Boolean)[0] || false
   );
 };
@@ -584,42 +528,40 @@
 const clearTemporaryData = () => {
   const { setLayerVisible, removeMapDatas } = events_params;
   const keys_ = [
-    "问题管线",
-    "1_泵站",
-    "1_污水处理厂",
-    "1_调蓄池",
-    "分区流向",
-    "分区流向1",
-    "rainwater_pipeline_water_level",
-    "rainwater_pipeline_water_level_GWGSWYX",
-    "outlet_info1",
-    "temporary",
-    "highlight_linestring",
-    "highlight_polygon",
-    "highlight_point",
+    '问题管线',
+    '1_泵站',
+    '1_污水处理厂',
+    '1_调蓄池',
+    '分区流向',
+    '分区流向1',
+    'rainwater_pipeline_water_level',
+    'rainwater_pipeline_water_level_GWGSWYX',
+    'outlet_info1',
+    'temporary',
+    'highlight_linestring',
+    'highlight_polygon',
+    'highlight_point',
   ];
-  const hideKeys = ["雨水系统流向", "雨水系统流向1"];
+  const hideKeys = ['雨水系统流向', '雨水系统流向1'];
   bus.emit(removeMapDatas.key, keys_);
-  const keys = newfiberMap.config_.l7.filter((i) => i.temporary).map((i) => i.key);
+  const keys = newfiberMap.config_.l7.filter(i => i.temporary).map(i => i.key);
   newfiberMap
     .getLayers()
-    .filter((i) => keys.includes(i.newfiberId))
-    .forEach((i) => i.setData({ type: "FeatureCollection", features: [] }));
-  hideKeys.forEach((i) => busEmit(setLayerVisible.key, { layername: i, isCheck: false }));
+    .filter(i => keys.includes(i.newfiberId))
+    .forEach(i => i.setData({ type: 'FeatureCollection', features: [] }));
+  hideKeys.forEach(i => busEmit(setLayerVisible.key, { layername: i, isCheck: false }));
 
   setHighlight_();
 };
 
 const remove3Dtiles = () => {
-  newfiberMap.map._controls
-    .filter((i) => i._deck)
-    .forEach((i) => i.setProps({ layers: [] }));
+  newfiberMap.map._controls.filter(i => i._deck).forEach(i => i.setProps({ layers: [] }));
 };
 
 const load3DTiles = ({ id, url }) => {
   remove3Dtiles();
   let deckOverlay = null;
-  deckOverlay = newfiberMap.map._controls.filter((i) => i._deck)[0];
+  deckOverlay = newfiberMap.map._controls.filter(i => i._deck)[0];
   if (!deckOverlay) {
     deckOverlay = new MapboxOverlay({
       interleaved: true,
@@ -639,15 +581,15 @@
         extruded: true, // 设置3D功能
         opacity: 1, // 设置透明度
         loadOptions: {
-          "3d-tiles": {
+          '3d-tiles': {
             loadGLTF: true,
             decodeQuantizedPositions: false,
-            isTileset: "auto",
+            isTileset: 'auto',
             assetGltfUpAxis: null,
           },
         },
         pickable: true, // 设置可选取
-        onTilesetLoad: (tileset) => {
+        onTilesetLoad: tileset => {
           const { cartographicCenter, zoom } = tileset;
           deckOverlay.setProps({
             initialViewState: {
@@ -667,29 +609,27 @@
 
 const busOn = (event, func) => bus.on(event, func);
 
-const busOff = (event) => bus.off(event);
+const busOff = event => bus.off(event);
 //添加临时动态线
 const addDynamicLine = (c_layer, c_layer1) => {
-  if (newfiberMap.getLayerByName("dynamicLine")) {
-    newfiberMap.removeLayer(newfiberMap.getLayerByName("dynamicLine"));
+  if (newfiberMap.getLayerByName('dynamicLine')) {
+    newfiberMap.removeLayer(newfiberMap.getLayerByName('dynamicLine'));
   }
   let dynamicLineJson = turf.featureCollection(
     newfiberMap.map
-      .getSource("sx_wn_hm_merge")
+      .getSource('sx_wn_hm_merge')
       ._data.features.filter(
-        (feature) =>
-          feature.properties.c_layer.includes(c_layer) &&
-          feature.properties.c_layer.includes(c_layer1)
+        feature => feature.properties.c_layer.includes(c_layer) && feature.properties.c_layer.includes(c_layer1)
       )
   );
   console.log(c_layer, dynamicLineJson);
   let layer = new mapboxL7.LineLayer({
-    name: "dynamicLine",
+    name: 'dynamicLine',
   })
     .source(dynamicLineJson)
     .size(3)
-    .shape("line")
-    .color("color")
+    .shape('line')
+    .color('color')
     .animate({
       interval: 1,
       duration: 2,
@@ -698,28 +638,28 @@
   newfiberMap.addLayer(layer);
 };
 const events_params = {
-  removeMapDatas: { key: "removeMapDatas" },
-  setGeoJSON: { key: "setGeoJSON" },
-  setLayerVisible: { key: "setLayerVisible" },
-  beansToMap: { key: "beansToMap" },
-  closeAllLayer: { key: "closeAllLayer" },
-  setHighlight: { key: "setHighlight" },
-  dataToMap: { key: "dataToMap", method: dataToMap },
-  pathPlanning: { key: "pathPlanning", method: pathPlanning },
-  panelDataToMap: { key: "panelDataToMap", method: panelDataToMap },
-  trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap },
-  clearTrajectory: { key: "clearTrajectory", method: clearTrajectory },
-  clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData },
-  load3DTiles: { key: "load3DTiles", method: load3DTiles },
-  remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles },
+  removeMapDatas: { key: 'removeMapDatas' },
+  setGeoJSON: { key: 'setGeoJSON' },
+  setLayerVisible: { key: 'setLayerVisible' },
+  beansToMap: { key: 'beansToMap' },
+  closeAllLayer: { key: 'closeAllLayer' },
+  setHighlight: { key: 'setHighlight' },
+  dataToMap: { key: 'dataToMap', method: dataToMap },
+  pathPlanning: { key: 'pathPlanning', method: pathPlanning },
+  panelDataToMap: { key: 'panelDataToMap', method: panelDataToMap },
+  trajectoryToMap: { key: 'trajectoryToMap', method: trajectoryToMap },
+  clearTrajectory: { key: 'clearTrajectory', method: clearTrajectory },
+  clearTemporaryData: { key: 'clearTemporaryData', method: clearTemporaryData },
+  load3DTiles: { key: 'load3DTiles', method: load3DTiles },
+  remove3Dtiles: { key: 'remove3Dtiles', method: remove3Dtiles },
   isOpenPanorama: {
-    key: "isOpenPanorama",
-    method: (flag) => (datas.isOpenPanorama = flag),
+    key: 'isOpenPanorama',
+    method: flag => (datas.isOpenPanorama = flag),
   },
 };
 
 onMounted(() => {
-  bus.on("YQ_head", (val) => {
+  bus.on('YQ_head', val => {
     if (val == false) {
       MapShow.value = false;
     } else {
@@ -729,10 +669,10 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("YQ_head");
+  bus.off('YQ_head');
   Object.keys(events_params)
-    .filter((key) => events_params[key].method)
-    .forEach((key) => busOff(events_params[key].key));
+    .filter(key => events_params[key].method)
+    .forEach(key => busOff(events_params[key].key));
   clearInterval(refreshTimer.value); // 清除定时器
   refreshTimer.value = null;
 });

diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 384f16e..3303742 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -1,11 +1,5 @@
 <template>
-  <MapBox
-    :initJson="props.initJson"
-    :loadCallback="getModalData"
-    @map-click="mapClickEvt"
-    v-show="MapShow"
-  >
-  </MapBox>
+  <MapBox :initJson="props.initJson" :loadCallback="getModalData" @map-click="mapClickEvt" v-show="MapShow"> </MapBox>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -13,29 +7,29 @@
 </template>
 
 <script setup name="Map">
-import bus from "@/bus";
-import request from "@/utils/request";
-import MapBox from "@/components/Map/Map";
-import { getBaseListPoint } from "@/api/MonitorAssetsOnMap";
-import { supervisionRealinformationList } from "@/api/internetVehicles";
-import useUserStore from "@/store/modules/user";
-import { reactive, onMounted, onBeforeUnmount, nextTick, defineProps, watch } from "vue";
-import streetSpace from "@/components/Map/streetSpace";
-import gq_line from "../../../public/static/libs/mapbox/json/gq_line.json";
-import ys_flow from "../../../public/static/libs/mapbox/json/ys_flow.json";
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { MapboxOverlay } from "@deck.gl/mapbox";
-import { LineLayer, GeoJsonLayer } from "@deck.gl/layers";
-import { TripsLayer, Tile3DLayer } from "@deck.gl/geo-layers";
-import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
+import bus from '@/bus';
+import request from '@/utils/request';
+import MapBox from '@/components/Map/Map';
+import { getBaseListPoint } from '@/api/MonitorAssetsOnMap';
+import { supervisionRealinformationList } from '@/api/internetVehicles';
+import useUserStore from '@/store/modules/user';
+import { reactive, onMounted, onBeforeUnmount, nextTick, defineProps, watch } from 'vue';
+import streetSpace from '@/components/Map/streetSpace';
+import gq_line from '../../../public/static/libs/mapbox/json/gq_line.json';
+import ys_flow from '../../../public/static/libs/mapbox/json/ys_flow.json';
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { MapboxOverlay } from '@deck.gl/mapbox';
+import { LineLayer, GeoJsonLayer } from '@deck.gl/layers';
+import { TripsLayer, Tile3DLayer } from '@deck.gl/geo-layers';
+import { Tiles3DLoader } from '@loaders.gl/3d-tiles';
 const appStore = useUserStore();
 const MapShow = ref(true);
 const props = defineProps({
   // 数据id
   initJson: {
     type: String,
-    default: () => "/static/libs/mapbox/style/wh_dhgx.json",
+    default: () => '/static/libs/mapbox/style/wh_dhgx.json',
   },
   loadCallback: {
     type: Function,
@@ -50,77 +44,77 @@
 const refreshTimer = ref(null);
 const default_params = {
   point: {
-    key: "point",
+    key: 'point',
     prevId: null,
   },
   sx_wn_hm_monitoring: {
-    key: "sx_wn_hm_monitoring",
+    key: 'sx_wn_hm_monitoring',
     prevId: null,
   },
   town: {
-    key: "乡镇",
-    c_key: "村",
+    key: '乡镇',
+    c_key: '村',
     prevId: null,
   },
   hupo: {
-    key: "湖泊",
+    key: '湖泊',
     prevId: null,
   },
   gangqu: {
-    key: "港渠",
+    key: '港渠',
     prevId: null,
   },
   hb_wh_dhgx_merge: {
-    key: "hb_wh_dhgx_merge",
+    key: 'hb_wh_dhgx_merge',
     children: {
-      psfq: { key: "排水分区" },
+      psfq: { key: '排水分区' },
     },
     prevId: null,
   },
-  海绵型水系: { color: "rgba(35,184,153,1)" },
-  海绵建筑与社区: { color: "rgba(255,119,125,1)" },
-  海绵型道路广场: { color: "rgba(255,152,4,1)" },
-  管网及泵站: { color: "rgba(0,153,68,1)" },
-  海绵型公园绿地: { color: "rgba(223,214,20,1)" },
-  flow: { color: "rgba(255,255,255,1)" },
-  rain: { color: "rgba(255,255,255,1)" },
+  海绵型水系: { color: 'rgba(35,184,153,1)' },
+  海绵建筑与社区: { color: 'rgba(255,119,125,1)' },
+  海绵型道路广场: { color: 'rgba(255,152,4,1)' },
+  管网及泵站: { color: 'rgba(0,153,68,1)' },
+  海绵型公园绿地: { color: 'rgba(223,214,20,1)' },
+  flow: { color: 'rgba(255,255,255,1)' },
+  rain: { color: 'rgba(255,255,255,1)' },
 
-  water_level: { color: "rgba(255,255,255,1)" },
-  waterlogging: { color: "rgba(255,255,255,1)" },
+  water_level: { color: 'rgba(255,255,255,1)' },
+  waterlogging: { color: 'rgba(255,255,255,1)' },
 
-  rain_bz: { color: "rgba(255,255,255,1)" },
-  sxt: { color: "rgba(255,255,255,1)" },
-  WSCLC: { color: "rgba(255,255,255,1)" },
-  overflow_outfall: { color: "rgba(255,255,255,1)" },
+  rain_bz: { color: 'rgba(255,255,255,1)' },
+  sxt: { color: 'rgba(255,255,255,1)' },
+  WSCLC: { color: 'rgba(255,255,255,1)' },
+  overflow_outfall: { color: 'rgba(255,255,255,1)' },
 
-  rainfall: { color: "rgba(223,214,20,1)" },
-  pipeline: { color: "rgba(223,214,20,1)" },
-  drain_outlet: { color: "rgba(223,214,20,1)" },
+  rainfall: { color: 'rgba(223,214,20,1)' },
+  pipeline: { color: 'rgba(223,214,20,1)' },
+  drain_outlet: { color: 'rgba(223,214,20,1)' },
 };
-window.mapInitBusName = "mapInitBusName";
+window.mapInitBusName = 'mapInitBusName';
 const mapClickEvt = (lngLat, properties, layerId) => {
   datas.isOpenPanorama &&
     (() => {
-      setPopupDom("proxy.$refs.streetSpace1", 2);
+      setPopupDom('proxy.$refs.streetSpace1', 2);
       newfiberMap.popup1.setLngLat(lngLat).addTo(newfiberMap.map);
       datas.location = lngLat;
     })();
 
-  console.log("properties", properties, layerId);
+  console.log('properties', properties, layerId);
   // 图层点击事件
-  if (properties) bus.emit("FenQuClick", properties);
+  if (properties) bus.emit('FenQuClick', properties);
   clearTrajectory();
   clearTemporaryData();
-  proxy.$emit("map-click1", lngLat, properties, layerId);
+  proxy.$emit('map-click1', lngLat, properties, layerId);
   const { town, hupo, gangqu, hb_wh_dhgx_merge } = default_params;
   const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
-  const _keys = ["rain_water_pump_station_info", "sewage_pump_station_info"];
+  const _keys = ['rain_water_pump_station_info', 'sewage_pump_station_info'];
 
   (() => {
     setHighlight_(properties);
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == "村域边界")[0]
+      .filter(i => i.newfiberId == '村域边界')[0]
       .setData(turf.featureCollection([]));
     if (town.prevId) {
       busEmit(setLayerVisible.key, { layername: town.key, isCheck: true });
@@ -129,20 +123,18 @@
     }
     busEmit(
       removeMapDatas.key,
-      _keys.map((k) => k + 1)
+      _keys.map(k => k + 1)
     );
   })();
-  ((
-    {
+  (
+    ({
       [town.key]: () => {
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == "村域边界")[0]
+          .filter(i => i.newfiberId == '村域边界')[0]
           .setData(
             turf.featureCollection(
-              newfiberMap.map
-                .getSource("hb_wh_gxq_cun2")
-                ._data.features.filter((i) => i.properties.type == properties.name)
+              newfiberMap.map.getSource('hb_wh_gxq_cun2')._data.features.filter(i => i.properties.type == properties.name)
             )
           );
         busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
@@ -154,38 +146,30 @@
           busEmit(setLayerVisible.key, {
             layername: hupo.prevId,
             isCheck: false,
-            values: [hupo.prevId, ["严东湖", "严西湖"].join(",")],
+            values: [hupo.prevId, ['严东湖', '严西湖'].join(',')],
           });
           hupo.prevId = null;
-          bus.emit("removeMapDatas", ["outlet_info1"]);
+          bus.emit('removeMapDatas', ['outlet_info1']);
         }
-        const keys = ["outlet_info", "村域边界", "lake"];
-        const specialKeys = ["严东湖", "严西湖"];
+        const keys = ['outlet_info', '村域边界', 'lake'];
+        const specialKeys = ['严东湖', '严西湖'];
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == keys[1])[0]
-          .setData(
-            turf.featureCollection(
-              gq_line.features.filter((i) => i.properties.w_id == properties.name)
-            )
-          );
+          .filter(i => i.newfiberId == keys[1])[0]
+          .setData(turf.featureCollection(gq_line.features.filter(i => i.properties.w_id == properties.name)));
         let features = newfiberMap.map
-          .getSource("point")
+          .getSource('point')
           ._data.features.filter(
-            (i) =>
-              i.properties.type == keys[0] &&
-              i.properties.waterBodyType == keys[2] &&
-              i.properties.waterBodyId == properties.pid
+            i =>
+              i.properties.type == keys[0] && i.properties.waterBodyType == keys[2] && i.properties.waterBodyId == properties.pid
           )
-          .map((i) => _.cloneDeep(i));
-        features.forEach((i) => (i.properties.type = i.properties.type + "1"));
+          .map(i => _.cloneDeep(i));
+        features.forEach(i => (i.properties.type = i.properties.type + '1'));
         busEmit(events_params.setGeoJSON.key, {
           json: turf.featureCollection(features),
           key: keys[0] + 1,
         });
-        const values = [
-          specialKeys.includes(properties.name) ? specialKeys.join(",") : properties.name,
-        ];
+        const values = [specialKeys.includes(properties.name) ? specialKeys.join(',') : properties.name];
         busEmit(setLayerVisible.key, {
           layername: properties.name,
           isCheck: true,
@@ -196,27 +180,21 @@
       [gangqu.key]: () => {
         if (gangqu.prevId) {
           gangqu.prevId = null;
-          bus.emit("removeMapDatas", ["outlet_info1"]);
+          bus.emit('removeMapDatas', ['outlet_info1']);
         }
-        const keys = ["outlet_info", "村域边界", "channel"];
+        const keys = ['outlet_info', '村域边界', 'channel'];
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == keys[1])[0]
-          .setData(
-            turf.featureCollection(
-              gq_line.features.filter((i) => i.properties.name == properties.name)
-            )
-          );
+          .filter(i => i.newfiberId == keys[1])[0]
+          .setData(turf.featureCollection(gq_line.features.filter(i => i.properties.name == properties.name)));
         let features = newfiberMap.map
-          .getSource("point")
+          .getSource('point')
           ._data.features.filter(
-            (i) =>
-              i.properties.type == keys[0] &&
-              i.properties.waterBodyType == keys[2] &&
-              i.properties.waterBodyId == properties.pid
+            i =>
+              i.properties.type == keys[0] && i.properties.waterBodyType == keys[2] && i.properties.waterBodyId == properties.pid
           )
-          .map((i) => _.cloneDeep(i));
-        features.forEach((i) => (i.properties.type = i.properties.type + "1"));
+          .map(i => _.cloneDeep(i));
+        features.forEach(i => (i.properties.type = i.properties.type + '1'));
         busEmit(events_params.setGeoJSON.key, {
           json: turf.featureCollection(features),
           key: keys[0] + 1,
@@ -225,75 +203,59 @@
       },
       [hb_wh_dhgx_merge.key]: () => {
         if (properties.layer == hb_wh_dhgx_merge.children.psfq.key) {
-          const layerSplit = properties.c_layer.split("_");
+          const layerSplit = properties.c_layer.split('_');
           let geometry = Terraformer.WKT.parse(properties.geometry);
 
           busEmit(setHighlight.key, []);
-          const type = _.chunk(layerSplit[1], 2)[0].join("");
-          let pType = type == "雨水" ? "YS" : "WS";
-          pType == "YS" ? ys_flow(properties, true) : ws_flow(properties);
+          const type = _.chunk(layerSplit[1], 2)[0].join('');
+          let pType = type == '雨水' ? 'YS' : 'WS';
+          pType == 'YS' ? ys_flow(properties, true) : ws_flow(properties);
           if (layerSplit[2] != 3) return mapCenterByData(turf.bbox(geometry));
           let features = newfiberMap.map
-            .getSource("hb_wh_dhgx_pipe_line_n_y_w")
-            ._data.features.filter(
-              (i) =>
-                i.properties[type + "系统"] == properties.name &&
-                i.properties["管段类型"] == pType
-            );
+            .getSource('hb_wh_dhgx_pipe_line_n_y_w')
+            ._data.features.filter(i => i.properties[type + '系统'] == properties.name && i.properties['管段类型'] == pType);
           let pFeatures = newfiberMap.map
-            .getSource("point")
-            ._data.features.filter(
-              (i) =>
-                _keys.includes(i.properties.type) &&
-                (i.properties.pointTypeName || "").includes(type)
-            );
-          let p_features = turf.pointsWithinPolygon(
-            turf.featureCollection(pFeatures),
-            geometry
-          );
-          p_features.features.forEach((i) => (i.properties.type = i.properties.type + 1));
+            .getSource('point')
+            ._data.features.filter(i => _keys.includes(i.properties.type) && (i.properties.pointTypeName || '').includes(type));
+          let p_features = turf.pointsWithinPolygon(turf.featureCollection(pFeatures), geometry);
+          p_features.features.forEach(i => (i.properties.type = i.properties.type + 1));
           busEmit(setGeoJSON.key, { json: p_features });
-          console.log("features", p_features, pFeatures);
-          busEmit(
-            setHighlight.key,
-            turf.flatten(turf.featureCollection(features)).features
-          );
+          console.log('features', p_features, pFeatures);
+          busEmit(setHighlight.key, turf.flatten(turf.featureCollection(features)).features);
         }
       },
-    }[layerId] ||
+    })[layerId] ||
     function () {
       //newfiberMap.map.easeTo(newfiberMap.config_.params.init);
     }
-  )());
+  )();
 
   function ys_flow(properties, visible) {
-    const keys = ["雨水系统流向", "雨水系统流向1"];
-    keys.forEach((key) =>
-      busEmit(setLayerVisible.key, { layername: key, isCheck: visible })
-    );
+    const keys = ['雨水系统流向', '雨水系统流向1'];
+    keys.forEach(key => busEmit(setLayerVisible.key, { layername: key, isCheck: visible }));
     setHighlight_(properties);
   }
 
   function ws_flow(properties) {
-    const keys_ = ["雨水", "污水"];
-    const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-    bus.emit("removeMapDatas", keys);
+    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([]));
-    let key = (properties.c_layer || "").includes(keys_[0]) ? keys_[0] : keys_[1];
+    let key = (properties.c_layer || '').includes(keys_[0]) ? keys_[0] : keys_[1];
     if (properties.pointTypeName) key = keys_[1];
-    const nameKey = "龙王咀" || properties.name.substring(0, 2);
-    let features = line.features.filter((i) => i.properties.area.includes(key));
+    const nameKey = '龙王咀' || properties.name.substring(0, 2);
+    let features = line.features.filter(i => i.properties.area.includes(key));
     // let features1 = point.features.filter(i => i.properties.type.includes(key) );
-    let points = _.groupBy(point.features, (a) => a.properties.type);
-    features.forEach((i) => {
+    let points = _.groupBy(point.features, 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) =>
+    /*    Object.keys(points).map((key) =>
       bus.emit("setGeoJSON", {
         json: turf.featureCollection(
           points[key].map((i) => ({
@@ -306,7 +268,7 @@
       })
     );*/
     // bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
-  /*  newfiberMap
+    /*  newfiberMap
       .getLayers()
       .filter((i) => i.newfiberId == keys[3])[0]
       .getSource()
@@ -316,18 +278,16 @@
 };
 
 function setHighlight_(properties = {}) {
-  const temporary = "temporary";
-  bus.emit("removeMapDatas", [temporary]);
+  const temporary = 'temporary';
+  bus.emit('removeMapDatas', [temporary]);
   if (!properties.geometry) return;
   let geojson = turf.polygonToLine(Terraformer.WKT.parse(properties.geometry));
   geojson = geojson.features ? geojson : turf.featureCollection([geojson]);
-  geojson.features.forEach(
-    (i) => (i.properties = { color: "rgba(255,255,0,1)", type: temporary })
-  );
-  bus.emit("setGeoJSON", { json: geojson, key: temporary });
+  geojson.features.forEach(i => (i.properties = { color: 'rgba(255,255,0,1)', type: temporary }));
+  bus.emit('setGeoJSON', { json: geojson, key: temporary });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "村域边界")[0]
+    .filter(i => i.newfiberId == '村域边界')[0]
     .setData(geojson);
 }
 
@@ -335,8 +295,8 @@
   isClockInRange();
   const { setLayerVisible, setHighlight } = events_params;
   Object.keys(events_params)
-    .filter((key) => events_params[key].method)
-    .forEach((key) => busOn(events_params[key].key, events_params[key].method));
+    .filter(key => events_params[key].method)
+    .forEach(key => busOn(events_params[key].key, events_params[key].method));
   // 获取地图项目数据
   dataToMap({});
   //5分钟刷新一次实时数据1000 * 60 * 5)
@@ -345,29 +305,27 @@
   }, 1000 * 60 * 5);*/
   createPopup();
   busEmit(events_params.closeAllLayer.key);
-  proxy.$emit("loadCallback");
+  proxy.$emit('loadCallback');
   ww();
   ysFlow();
 };
 
 const ysFlow = () => {
-  const key = "雨水系统流向";
+  const key = '雨水系统流向';
   // let features = line.features.filter(i => key.includes(i.properties.area));
   // ys_flow.features = ys_flow.features.concat(features).map(i => ({ ...i, properties: { ...i.properties, color: 'rgba(49,254,223,1)', name: undefined } }));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == key)[0]
+    .filter(i => i.newfiberId == key)[0]
     .setData(ys_flow);
   busEmit(events_params.setGeoJSON.key, { json: ys_flow, key: key + 1 });
 };
 
 const ww = () => {
-  const keys = ["尾水路径"];
+  const keys = ['尾水路径'];
   let features = newfiberMap.map
-    .getSource("hb_wh_dhgx_merge")
-    ._data.features.filter(
-      (i) => i.properties.c_layer.includes(keys[0]) && i.properties.geometry_type == 2
-    );
+    .getSource('hb_wh_dhgx_merge')
+    ._data.features.filter(i => i.properties.c_layer.includes(keys[0]) && i.properties.geometry_type == 2);
   busEmit(events_params.setGeoJSON.key, {
     json: turf.featureCollection(features),
     key: keys[0],
@@ -375,33 +333,29 @@
 };
 
 let prevObj = null;
-const panelDataToMap = (obj) => {
+const panelDataToMap = obj => {
   // debugger
   const { setLayerVisible, setHighlight } = events_params;
   // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false });
   busEmit(setHighlight.key, []);
   // busEmit(setLayerVisible.key, { layername: obj.type, isCheck: true });
   // debugger;
-  let features = ["point", "linestring", "polygon", "hb_wh_dhgx_merge"]
-    .map((key) =>
+  let features = ['point', 'linestring', 'polygon', 'hb_wh_dhgx_merge']
+    .map(key =>
       newfiberMap.map
         .getSource(key)
         ._options.data.features.filter(
-          (i) =>
-            (i.properties.name || "").includes(obj.name) &&
-            (obj.id ? obj.id == i.properties.pid : true)
+          i => (i.properties.name || '').includes(obj.name) && (obj.id ? obj.id == i.properties.pid : true)
         )
     )
     .flat();
-  let feature =
-    features.filter((i) => i.properties.name == obj.name)[0] ||
-    features[_.random(0, features.length - 1)];
+  let feature = features.filter(i => i.properties.name == obj.name)[0] || features[_.random(0, features.length - 1)];
   if (!feature) return;
   busEmit(setHighlight.key, [feature]);
   mapCenterByData(turf.bbox(feature));
 };
 
-const mapCenterByData = (bbox) => {
+const mapCenterByData = bbox => {
   newfiberMap.map.fitBounds(
     [
       [bbox[0], bbox[1]],
@@ -410,29 +364,24 @@
     { padding: 50, offset: [100, 10], maxZoom: 18, pitch: 0, duration: 500 }
   );
 };
-const trajectoryToMap = (data) => {
+const trajectoryToMap = data => {
   clearTrajectory();
-  const fields = { lng: "l", lat: "a" };
-  mapCenterByData([data[0]["l"], data[0]["a"], data[1]["l"], data[1]["a"]].map(Number));
-  newfiberMap.map.trackLayer = new mapboxgl1.TrackLayer(
-    newfiberMap.map,
-    data,
-    fields,
-    (properties, index) => {
-      const lng = properties[fields.lng];
-      const lat = properties[fields.lat];
-      if (!(index % 50)) {
-        newfiberMap.map.flyTo({
-          center: [lng, lat],
-          bearing: newfiberMap.map.getBearing(),
-          pitch: newfiberMap.map.getPitch(),
-          zoom: newfiberMap.map.getZoom(),
-        });
-      }
-      /*        setPopupDom('proxy.$refs.trajectory', 1);
-                            newfiberMap.popup.setLngLat([lng,lat]).addTo(newfiberMap.map);*/
+  const fields = { lng: 'l', lat: 'a' };
+  mapCenterByData([data[0]['l'], data[0]['a'], data[1]['l'], data[1]['a']].map(Number));
+  newfiberMap.map.trackLayer = new mapboxgl1.TrackLayer(newfiberMap.map, data, fields, (properties, index) => {
+    const lng = properties[fields.lng];
+    const lat = properties[fields.lat];
+    if (!(index % 50)) {
+      newfiberMap.map.flyTo({
+        center: [lng, lat],
+        bearing: newfiberMap.map.getBearing(),
+        pitch: newfiberMap.map.getPitch(),
+        zoom: newfiberMap.map.getZoom(),
+      });
     }
-  );
+    /*        setPopupDom('proxy.$refs.trajectory', 1);
+                            newfiberMap.popup.setLngLat([lng,lat]).addTo(newfiberMap.map);*/
+  });
 };
 
 const clearTrajectory = () => {
@@ -445,47 +394,47 @@
   const data_default_params = {
     sites: {
       method: getBaseListPoint,
-      fields: { geometry: "geometry", name: "name" },
-      groupMethod: (data) =>
+      fields: { geometry: 'geometry', name: 'name' },
+      groupMethod: data =>
         _.groupBy(
           data
-            .map((i) => i.data)
+            .map(i => i.data)
             .flat()
-            .filter((i) => i.geometry)
-            .map((item) => ({ ...item })),
-          (v) => v.pointType + (v.connectType ? "_" + v.connectType : "")
+            .filter(i => i.geometry)
+            .map(item => ({ ...item })),
+          v => v.pointType + (v.connectType ? '_' + v.connectType : '')
         ),
     },
     //车辆
     cheliang: {
       method: supervisionRealinformationList,
-      fields: { lng: "longitude", lat: "latitude", name: "plateNumber" },
-      groupMethod: (data) =>
+      fields: { lng: 'longitude', lat: 'latitude', name: 'plateNumber' },
+      groupMethod: data =>
         _.groupBy(
           data.supervisionRealinformationList
-            .filter((i) => i.longitude && i.latitude)
-            .map((item) => ({ ...item, type: item.vehicleCategory + item.status })),
-          (v) => v.type
+            .filter(i => i.longitude && i.latitude)
+            .map(item => ({ ...item, type: item.vehicleCategory + item.status })),
+          v => v.type
         ),
     },
   };
   let keys = Object.keys(params || data_default_params);
   const results = await Promise.all(
-    keys.map((k, idx) =>
-      data_default_params[k].method((params || {})[k] || data_default_params[k].mPrams)
-    )
+    keys.map((k, idx) => data_default_params[k].method((params || {})[k] || data_default_params[k].mPrams))
   );
   results.forEach((result, idx) => {
     const data = result.data;
     const k = keys[idx];
     if (!data) return;
-    bus.emit("changeData");
+    const filteredData = filterGeometryNotEmpty(data);
+    appStore.SET_MapData(filteredData);
+    bus.emit('changeData');
     const groups = data_default_params[k].groupMethod(data);
     const g_keys = Object.keys(groups);
-    bus.emit("removeMapDatas", g_keys);
-    g_keys.forEach((key) =>
+    bus.emit('removeMapDatas', g_keys);
+    g_keys.forEach(key =>
       busEmit(beansToMap.key, {
-        beans: groups[key].map((i) => ({
+        beans: groups[key].map(i => ({
           ...i,
           color: (default_params[key] || {}).color,
         })),
@@ -513,16 +462,16 @@
   f();
   nextTick(f);
   function f() {
-    console.log("eval(dom)", eval(dom));
+    console.log('eval(dom)', eval(dom));
     newfiberMap.popup1.setDOMContent(eval(dom));
     newfiberMap.popup1.setOffset(offset);
   }
 };
 
 function filterGeometryNotEmpty(inputData) {
-  return inputData.map((item) => {
+  return inputData.map(item => {
     // 过滤掉每个对象中的 data 数组里 geometry 为空的元素
-    const filteredData = item.data.filter((dataPoint) => dataPoint.geometry !== "");
+    const filteredData = item.data.filter(dataPoint => dataPoint.geometry !== '');
     return {
       ...item,
       data: filteredData,
@@ -531,29 +480,24 @@
 }
 
 //路径规划
-const pathPlanning = async (
-  origin = "116.481028,39.989643",
-  destination = "116.465302,40.004717",
-  callback
-) => {
-  const origin_ = origin.split(",").map(Number);
-  const destination_ = destination.split(",").map(Number);
-  if (origin_.length != 2 || destination_.length != 2)
-    return console.log("输入参数错误：", origin, destination);
+const pathPlanning = async (origin = '116.481028,39.989643', destination = '116.465302,40.004717', callback) => {
+  const origin_ = origin.split(',').map(Number);
+  const destination_ = destination.split(',').map(Number);
+  if (origin_.length != 2 || destination_.length != 2) return console.log('输入参数错误：', origin, destination);
   const results = await request(
     `/amap/v3/direction/driving?origin=${origin}&destination=${destination}&extensions=all&output=json&key=74f1b47f7fea1971354edb2dfacb3982`
   );
-  if (!results.route.paths[0]) return console.log("暂无路径！");
+  if (!results.route.paths[0]) return console.log('暂无路径！');
   callback &&
     callback(
       turf.featureCollection(
-        results.route.paths[0].steps.map((i) =>
+        results.route.paths[0].steps.map(i =>
           turf.feature(
             Terraformer.WKT.parse(
               `LINESTRING(${i.polyline
-                .split(";")
-                .map((i) => i.split(",").join(" "))
-                .join(",")})`
+                .split(';')
+                .map(i => i.split(',').join(' '))
+                .join(',')})`
             ),
             i
           )
@@ -564,19 +508,19 @@
 
 //判断是否在打卡点内
 const isClockInRange = (
-  currentLocation = "POINT(109.41360117253636 34.49038724464877)",
+  currentLocation = 'POINT(109.41360117253636 34.49038724464877)',
   ranges = [
-    "POINT(109.43167853335872 34.51345940211415)",
-    "POINT(109.46797592891363 34.51145239795833)",
-    "POINT(109.44903576574815 34.50165755773118)",
+    'POINT(109.43167853335872 34.51345940211415)',
+    'POINT(109.46797592891363 34.51145239795833)',
+    'POINT(109.44903576574815 34.50165755773118)',
   ],
   rVal = 500
 ) => {
   const feature = { ...Terraformer.WKT.parse(currentLocation) };
   return (
     ranges
-      .map((i) => turf.buffer({ ...Terraformer.WKT.parse(i) }, rVal / 1000))
-      .map((i) => turf.booleanContains(i, feature))
+      .map(i => turf.buffer({ ...Terraformer.WKT.parse(i) }, rVal / 1000))
+      .map(i => turf.booleanContains(i, feature))
       .filter(Boolean)[0] || false
   );
 };
@@ -584,42 +528,40 @@
 const clearTemporaryData = () => {
   const { setLayerVisible, removeMapDatas } = events_params;
   const keys_ = [
-    "问题管线",
-    "1_泵站",
-    "1_污水处理厂",
-    "1_调蓄池",
-    "分区流向",
-    "分区流向1",
-    "rainwater_pipeline_water_level",
-    "rainwater_pipeline_water_level_GWGSWYX",
-    "outlet_info1",
-    "temporary",
-    "highlight_linestring",
-    "highlight_polygon",
-    "highlight_point",
+    '问题管线',
+    '1_泵站',
+    '1_污水处理厂',
+    '1_调蓄池',
+    '分区流向',
+    '分区流向1',
+    'rainwater_pipeline_water_level',
+    'rainwater_pipeline_water_level_GWGSWYX',
+    'outlet_info1',
+    'temporary',
+    'highlight_linestring',
+    'highlight_polygon',
+    'highlight_point',
   ];
-  const hideKeys = ["雨水系统流向", "雨水系统流向1"];
+  const hideKeys = ['雨水系统流向', '雨水系统流向1'];
   bus.emit(removeMapDatas.key, keys_);
-  const keys = newfiberMap.config_.l7.filter((i) => i.temporary).map((i) => i.key);
+  const keys = newfiberMap.config_.l7.filter(i => i.temporary).map(i => i.key);
   newfiberMap
     .getLayers()
-    .filter((i) => keys.includes(i.newfiberId))
-    .forEach((i) => i.setData({ type: "FeatureCollection", features: [] }));
-  hideKeys.forEach((i) => busEmit(setLayerVisible.key, { layername: i, isCheck: false }));
+    .filter(i => keys.includes(i.newfiberId))
+    .forEach(i => i.setData({ type: 'FeatureCollection', features: [] }));
+  hideKeys.forEach(i => busEmit(setLayerVisible.key, { layername: i, isCheck: false }));
 
   setHighlight_();
 };
 
 const remove3Dtiles = () => {
-  newfiberMap.map._controls
-    .filter((i) => i._deck)
-    .forEach((i) => i.setProps({ layers: [] }));
+  newfiberMap.map._controls.filter(i => i._deck).forEach(i => i.setProps({ layers: [] }));
 };
 
 const load3DTiles = ({ id, url }) => {
   remove3Dtiles();
   let deckOverlay = null;
-  deckOverlay = newfiberMap.map._controls.filter((i) => i._deck)[0];
+  deckOverlay = newfiberMap.map._controls.filter(i => i._deck)[0];
   if (!deckOverlay) {
     deckOverlay = new MapboxOverlay({
       interleaved: true,
@@ -639,15 +581,15 @@
         extruded: true, // 设置3D功能
         opacity: 1, // 设置透明度
         loadOptions: {
-          "3d-tiles": {
+          '3d-tiles': {
             loadGLTF: true,
             decodeQuantizedPositions: false,
-            isTileset: "auto",
+            isTileset: 'auto',
             assetGltfUpAxis: null,
           },
         },
         pickable: true, // 设置可选取
-        onTilesetLoad: (tileset) => {
+        onTilesetLoad: tileset => {
           const { cartographicCenter, zoom } = tileset;
           deckOverlay.setProps({
             initialViewState: {
@@ -667,29 +609,27 @@
 
 const busOn = (event, func) => bus.on(event, func);
 
-const busOff = (event) => bus.off(event);
+const busOff = event => bus.off(event);
 //添加临时动态线
 const addDynamicLine = (c_layer, c_layer1) => {
-  if (newfiberMap.getLayerByName("dynamicLine")) {
-    newfiberMap.removeLayer(newfiberMap.getLayerByName("dynamicLine"));
+  if (newfiberMap.getLayerByName('dynamicLine')) {
+    newfiberMap.removeLayer(newfiberMap.getLayerByName('dynamicLine'));
   }
   let dynamicLineJson = turf.featureCollection(
     newfiberMap.map
-      .getSource("sx_wn_hm_merge")
+      .getSource('sx_wn_hm_merge')
       ._data.features.filter(
-        (feature) =>
-          feature.properties.c_layer.includes(c_layer) &&
-          feature.properties.c_layer.includes(c_layer1)
+        feature => feature.properties.c_layer.includes(c_layer) && feature.properties.c_layer.includes(c_layer1)
       )
   );
   console.log(c_layer, dynamicLineJson);
   let layer = new mapboxL7.LineLayer({
-    name: "dynamicLine",
+    name: 'dynamicLine',
   })
     .source(dynamicLineJson)
     .size(3)
-    .shape("line")
-    .color("color")
+    .shape('line')
+    .color('color')
     .animate({
       interval: 1,
       duration: 2,
@@ -698,28 +638,28 @@
   newfiberMap.addLayer(layer);
 };
 const events_params = {
-  removeMapDatas: { key: "removeMapDatas" },
-  setGeoJSON: { key: "setGeoJSON" },
-  setLayerVisible: { key: "setLayerVisible" },
-  beansToMap: { key: "beansToMap" },
-  closeAllLayer: { key: "closeAllLayer" },
-  setHighlight: { key: "setHighlight" },
-  dataToMap: { key: "dataToMap", method: dataToMap },
-  pathPlanning: { key: "pathPlanning", method: pathPlanning },
-  panelDataToMap: { key: "panelDataToMap", method: panelDataToMap },
-  trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap },
-  clearTrajectory: { key: "clearTrajectory", method: clearTrajectory },
-  clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData },
-  load3DTiles: { key: "load3DTiles", method: load3DTiles },
-  remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles },
+  removeMapDatas: { key: 'removeMapDatas' },
+  setGeoJSON: { key: 'setGeoJSON' },
+  setLayerVisible: { key: 'setLayerVisible' },
+  beansToMap: { key: 'beansToMap' },
+  closeAllLayer: { key: 'closeAllLayer' },
+  setHighlight: { key: 'setHighlight' },
+  dataToMap: { key: 'dataToMap', method: dataToMap },
+  pathPlanning: { key: 'pathPlanning', method: pathPlanning },
+  panelDataToMap: { key: 'panelDataToMap', method: panelDataToMap },
+  trajectoryToMap: { key: 'trajectoryToMap', method: trajectoryToMap },
+  clearTrajectory: { key: 'clearTrajectory', method: clearTrajectory },
+  clearTemporaryData: { key: 'clearTemporaryData', method: clearTemporaryData },
+  load3DTiles: { key: 'load3DTiles', method: load3DTiles },
+  remove3Dtiles: { key: 'remove3Dtiles', method: remove3Dtiles },
   isOpenPanorama: {
-    key: "isOpenPanorama",
-    method: (flag) => (datas.isOpenPanorama = flag),
+    key: 'isOpenPanorama',
+    method: flag => (datas.isOpenPanorama = flag),
   },
 };
 
 onMounted(() => {
-  bus.on("YQ_head", (val) => {
+  bus.on('YQ_head', val => {
     if (val == false) {
       MapShow.value = false;
     } else {
@@ -729,10 +669,10 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("YQ_head");
+  bus.off('YQ_head');
   Object.keys(events_params)
-    .filter((key) => events_params[key].method)
-    .forEach((key) => busOff(events_params[key].key));
+    .filter(key => events_params[key].method)
+    .forEach(key => busOff(events_params[key].key));
   clearInterval(refreshTimer.value); // 清除定时器
   refreshTimer.value = null;
 });
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 103504c..6befe29 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -10,8 +10,12 @@
     roles: [],
     userInfo: {},
     permissions: [],
+    MapData: [],
   }),
   actions: {
+    SET_MapData(MapData) {
+      this.MapData = MapData;
+    },
     // 登录
     login(userInfo) {
       const username = userInfo.username.trim();

diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 384f16e..3303742 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -1,11 +1,5 @@
 <template>
-  <MapBox
-    :initJson="props.initJson"
-    :loadCallback="getModalData"
-    @map-click="mapClickEvt"
-    v-show="MapShow"
-  >
-  </MapBox>
+  <MapBox :initJson="props.initJson" :loadCallback="getModalData" @map-click="mapClickEvt" v-show="MapShow"> </MapBox>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -13,29 +7,29 @@
 </template>
 
 <script setup name="Map">
-import bus from "@/bus";
-import request from "@/utils/request";
-import MapBox from "@/components/Map/Map";
-import { getBaseListPoint } from "@/api/MonitorAssetsOnMap";
-import { supervisionRealinformationList } from "@/api/internetVehicles";
-import useUserStore from "@/store/modules/user";
-import { reactive, onMounted, onBeforeUnmount, nextTick, defineProps, watch } from "vue";
-import streetSpace from "@/components/Map/streetSpace";
-import gq_line from "../../../public/static/libs/mapbox/json/gq_line.json";
-import ys_flow from "../../../public/static/libs/mapbox/json/ys_flow.json";
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { MapboxOverlay } from "@deck.gl/mapbox";
-import { LineLayer, GeoJsonLayer } from "@deck.gl/layers";
-import { TripsLayer, Tile3DLayer } from "@deck.gl/geo-layers";
-import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
+import bus from '@/bus';
+import request from '@/utils/request';
+import MapBox from '@/components/Map/Map';
+import { getBaseListPoint } from '@/api/MonitorAssetsOnMap';
+import { supervisionRealinformationList } from '@/api/internetVehicles';
+import useUserStore from '@/store/modules/user';
+import { reactive, onMounted, onBeforeUnmount, nextTick, defineProps, watch } from 'vue';
+import streetSpace from '@/components/Map/streetSpace';
+import gq_line from '../../../public/static/libs/mapbox/json/gq_line.json';
+import ys_flow from '../../../public/static/libs/mapbox/json/ys_flow.json';
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { MapboxOverlay } from '@deck.gl/mapbox';
+import { LineLayer, GeoJsonLayer } from '@deck.gl/layers';
+import { TripsLayer, Tile3DLayer } from '@deck.gl/geo-layers';
+import { Tiles3DLoader } from '@loaders.gl/3d-tiles';
 const appStore = useUserStore();
 const MapShow = ref(true);
 const props = defineProps({
   // 数据id
   initJson: {
     type: String,
-    default: () => "/static/libs/mapbox/style/wh_dhgx.json",
+    default: () => '/static/libs/mapbox/style/wh_dhgx.json',
   },
   loadCallback: {
     type: Function,
@@ -50,77 +44,77 @@
 const refreshTimer = ref(null);
 const default_params = {
   point: {
-    key: "point",
+    key: 'point',
     prevId: null,
   },
   sx_wn_hm_monitoring: {
-    key: "sx_wn_hm_monitoring",
+    key: 'sx_wn_hm_monitoring',
     prevId: null,
   },
   town: {
-    key: "乡镇",
-    c_key: "村",
+    key: '乡镇',
+    c_key: '村',
     prevId: null,
   },
   hupo: {
-    key: "湖泊",
+    key: '湖泊',
     prevId: null,
   },
   gangqu: {
-    key: "港渠",
+    key: '港渠',
     prevId: null,
   },
   hb_wh_dhgx_merge: {
-    key: "hb_wh_dhgx_merge",
+    key: 'hb_wh_dhgx_merge',
     children: {
-      psfq: { key: "排水分区" },
+      psfq: { key: '排水分区' },
     },
     prevId: null,
   },
-  海绵型水系: { color: "rgba(35,184,153,1)" },
-  海绵建筑与社区: { color: "rgba(255,119,125,1)" },
-  海绵型道路广场: { color: "rgba(255,152,4,1)" },
-  管网及泵站: { color: "rgba(0,153,68,1)" },
-  海绵型公园绿地: { color: "rgba(223,214,20,1)" },
-  flow: { color: "rgba(255,255,255,1)" },
-  rain: { color: "rgba(255,255,255,1)" },
+  海绵型水系: { color: 'rgba(35,184,153,1)' },
+  海绵建筑与社区: { color: 'rgba(255,119,125,1)' },
+  海绵型道路广场: { color: 'rgba(255,152,4,1)' },
+  管网及泵站: { color: 'rgba(0,153,68,1)' },
+  海绵型公园绿地: { color: 'rgba(223,214,20,1)' },
+  flow: { color: 'rgba(255,255,255,1)' },
+  rain: { color: 'rgba(255,255,255,1)' },
 
-  water_level: { color: "rgba(255,255,255,1)" },
-  waterlogging: { color: "rgba(255,255,255,1)" },
+  water_level: { color: 'rgba(255,255,255,1)' },
+  waterlogging: { color: 'rgba(255,255,255,1)' },
 
-  rain_bz: { color: "rgba(255,255,255,1)" },
-  sxt: { color: "rgba(255,255,255,1)" },
-  WSCLC: { color: "rgba(255,255,255,1)" },
-  overflow_outfall: { color: "rgba(255,255,255,1)" },
+  rain_bz: { color: 'rgba(255,255,255,1)' },
+  sxt: { color: 'rgba(255,255,255,1)' },
+  WSCLC: { color: 'rgba(255,255,255,1)' },
+  overflow_outfall: { color: 'rgba(255,255,255,1)' },
 
-  rainfall: { color: "rgba(223,214,20,1)" },
-  pipeline: { color: "rgba(223,214,20,1)" },
-  drain_outlet: { color: "rgba(223,214,20,1)" },
+  rainfall: { color: 'rgba(223,214,20,1)' },
+  pipeline: { color: 'rgba(223,214,20,1)' },
+  drain_outlet: { color: 'rgba(223,214,20,1)' },
 };
-window.mapInitBusName = "mapInitBusName";
+window.mapInitBusName = 'mapInitBusName';
 const mapClickEvt = (lngLat, properties, layerId) => {
   datas.isOpenPanorama &&
     (() => {
-      setPopupDom("proxy.$refs.streetSpace1", 2);
+      setPopupDom('proxy.$refs.streetSpace1', 2);
       newfiberMap.popup1.setLngLat(lngLat).addTo(newfiberMap.map);
       datas.location = lngLat;
     })();
 
-  console.log("properties", properties, layerId);
+  console.log('properties', properties, layerId);
   // 图层点击事件
-  if (properties) bus.emit("FenQuClick", properties);
+  if (properties) bus.emit('FenQuClick', properties);
   clearTrajectory();
   clearTemporaryData();
-  proxy.$emit("map-click1", lngLat, properties, layerId);
+  proxy.$emit('map-click1', lngLat, properties, layerId);
   const { town, hupo, gangqu, hb_wh_dhgx_merge } = default_params;
   const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
-  const _keys = ["rain_water_pump_station_info", "sewage_pump_station_info"];
+  const _keys = ['rain_water_pump_station_info', 'sewage_pump_station_info'];
 
   (() => {
     setHighlight_(properties);
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == "村域边界")[0]
+      .filter(i => i.newfiberId == '村域边界')[0]
       .setData(turf.featureCollection([]));
     if (town.prevId) {
       busEmit(setLayerVisible.key, { layername: town.key, isCheck: true });
@@ -129,20 +123,18 @@
     }
     busEmit(
       removeMapDatas.key,
-      _keys.map((k) => k + 1)
+      _keys.map(k => k + 1)
     );
   })();
-  ((
-    {
+  (
+    ({
       [town.key]: () => {
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == "村域边界")[0]
+          .filter(i => i.newfiberId == '村域边界')[0]
           .setData(
             turf.featureCollection(
-              newfiberMap.map
-                .getSource("hb_wh_gxq_cun2")
-                ._data.features.filter((i) => i.properties.type == properties.name)
+              newfiberMap.map.getSource('hb_wh_gxq_cun2')._data.features.filter(i => i.properties.type == properties.name)
             )
           );
         busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
@@ -154,38 +146,30 @@
           busEmit(setLayerVisible.key, {
             layername: hupo.prevId,
             isCheck: false,
-            values: [hupo.prevId, ["严东湖", "严西湖"].join(",")],
+            values: [hupo.prevId, ['严东湖', '严西湖'].join(',')],
           });
           hupo.prevId = null;
-          bus.emit("removeMapDatas", ["outlet_info1"]);
+          bus.emit('removeMapDatas', ['outlet_info1']);
         }
-        const keys = ["outlet_info", "村域边界", "lake"];
-        const specialKeys = ["严东湖", "严西湖"];
+        const keys = ['outlet_info', '村域边界', 'lake'];
+        const specialKeys = ['严东湖', '严西湖'];
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == keys[1])[0]
-          .setData(
-            turf.featureCollection(
-              gq_line.features.filter((i) => i.properties.w_id == properties.name)
-            )
-          );
+          .filter(i => i.newfiberId == keys[1])[0]
+          .setData(turf.featureCollection(gq_line.features.filter(i => i.properties.w_id == properties.name)));
         let features = newfiberMap.map
-          .getSource("point")
+          .getSource('point')
           ._data.features.filter(
-            (i) =>
-              i.properties.type == keys[0] &&
-              i.properties.waterBodyType == keys[2] &&
-              i.properties.waterBodyId == properties.pid
+            i =>
+              i.properties.type == keys[0] && i.properties.waterBodyType == keys[2] && i.properties.waterBodyId == properties.pid
           )
-          .map((i) => _.cloneDeep(i));
-        features.forEach((i) => (i.properties.type = i.properties.type + "1"));
+          .map(i => _.cloneDeep(i));
+        features.forEach(i => (i.properties.type = i.properties.type + '1'));
         busEmit(events_params.setGeoJSON.key, {
           json: turf.featureCollection(features),
           key: keys[0] + 1,
         });
-        const values = [
-          specialKeys.includes(properties.name) ? specialKeys.join(",") : properties.name,
-        ];
+        const values = [specialKeys.includes(properties.name) ? specialKeys.join(',') : properties.name];
         busEmit(setLayerVisible.key, {
           layername: properties.name,
           isCheck: true,
@@ -196,27 +180,21 @@
       [gangqu.key]: () => {
         if (gangqu.prevId) {
           gangqu.prevId = null;
-          bus.emit("removeMapDatas", ["outlet_info1"]);
+          bus.emit('removeMapDatas', ['outlet_info1']);
         }
-        const keys = ["outlet_info", "村域边界", "channel"];
+        const keys = ['outlet_info', '村域边界', 'channel'];
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == keys[1])[0]
-          .setData(
-            turf.featureCollection(
-              gq_line.features.filter((i) => i.properties.name == properties.name)
-            )
-          );
+          .filter(i => i.newfiberId == keys[1])[0]
+          .setData(turf.featureCollection(gq_line.features.filter(i => i.properties.name == properties.name)));
         let features = newfiberMap.map
-          .getSource("point")
+          .getSource('point')
           ._data.features.filter(
-            (i) =>
-              i.properties.type == keys[0] &&
-              i.properties.waterBodyType == keys[2] &&
-              i.properties.waterBodyId == properties.pid
+            i =>
+              i.properties.type == keys[0] && i.properties.waterBodyType == keys[2] && i.properties.waterBodyId == properties.pid
           )
-          .map((i) => _.cloneDeep(i));
-        features.forEach((i) => (i.properties.type = i.properties.type + "1"));
+          .map(i => _.cloneDeep(i));
+        features.forEach(i => (i.properties.type = i.properties.type + '1'));
         busEmit(events_params.setGeoJSON.key, {
           json: turf.featureCollection(features),
           key: keys[0] + 1,
@@ -225,75 +203,59 @@
       },
       [hb_wh_dhgx_merge.key]: () => {
         if (properties.layer == hb_wh_dhgx_merge.children.psfq.key) {
-          const layerSplit = properties.c_layer.split("_");
+          const layerSplit = properties.c_layer.split('_');
           let geometry = Terraformer.WKT.parse(properties.geometry);
 
           busEmit(setHighlight.key, []);
-          const type = _.chunk(layerSplit[1], 2)[0].join("");
-          let pType = type == "雨水" ? "YS" : "WS";
-          pType == "YS" ? ys_flow(properties, true) : ws_flow(properties);
+          const type = _.chunk(layerSplit[1], 2)[0].join('');
+          let pType = type == '雨水' ? 'YS' : 'WS';
+          pType == 'YS' ? ys_flow(properties, true) : ws_flow(properties);
           if (layerSplit[2] != 3) return mapCenterByData(turf.bbox(geometry));
           let features = newfiberMap.map
-            .getSource("hb_wh_dhgx_pipe_line_n_y_w")
-            ._data.features.filter(
-              (i) =>
-                i.properties[type + "系统"] == properties.name &&
-                i.properties["管段类型"] == pType
-            );
+            .getSource('hb_wh_dhgx_pipe_line_n_y_w')
+            ._data.features.filter(i => i.properties[type + '系统'] == properties.name && i.properties['管段类型'] == pType);
           let pFeatures = newfiberMap.map
-            .getSource("point")
-            ._data.features.filter(
-              (i) =>
-                _keys.includes(i.properties.type) &&
-                (i.properties.pointTypeName || "").includes(type)
-            );
-          let p_features = turf.pointsWithinPolygon(
-            turf.featureCollection(pFeatures),
-            geometry
-          );
-          p_features.features.forEach((i) => (i.properties.type = i.properties.type + 1));
+            .getSource('point')
+            ._data.features.filter(i => _keys.includes(i.properties.type) && (i.properties.pointTypeName || '').includes(type));
+          let p_features = turf.pointsWithinPolygon(turf.featureCollection(pFeatures), geometry);
+          p_features.features.forEach(i => (i.properties.type = i.properties.type + 1));
           busEmit(setGeoJSON.key, { json: p_features });
-          console.log("features", p_features, pFeatures);
-          busEmit(
-            setHighlight.key,
-            turf.flatten(turf.featureCollection(features)).features
-          );
+          console.log('features', p_features, pFeatures);
+          busEmit(setHighlight.key, turf.flatten(turf.featureCollection(features)).features);
         }
       },
-    }[layerId] ||
+    })[layerId] ||
     function () {
       //newfiberMap.map.easeTo(newfiberMap.config_.params.init);
     }
-  )());
+  )();
 
   function ys_flow(properties, visible) {
-    const keys = ["雨水系统流向", "雨水系统流向1"];
-    keys.forEach((key) =>
-      busEmit(setLayerVisible.key, { layername: key, isCheck: visible })
-    );
+    const keys = ['雨水系统流向', '雨水系统流向1'];
+    keys.forEach(key => busEmit(setLayerVisible.key, { layername: key, isCheck: visible }));
     setHighlight_(properties);
   }
 
   function ws_flow(properties) {
-    const keys_ = ["雨水", "污水"];
-    const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-    bus.emit("removeMapDatas", keys);
+    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([]));
-    let key = (properties.c_layer || "").includes(keys_[0]) ? keys_[0] : keys_[1];
+    let key = (properties.c_layer || '').includes(keys_[0]) ? keys_[0] : keys_[1];
     if (properties.pointTypeName) key = keys_[1];
-    const nameKey = "龙王咀" || properties.name.substring(0, 2);
-    let features = line.features.filter((i) => i.properties.area.includes(key));
+    const nameKey = '龙王咀' || properties.name.substring(0, 2);
+    let features = line.features.filter(i => i.properties.area.includes(key));
     // let features1 = point.features.filter(i => i.properties.type.includes(key) );
-    let points = _.groupBy(point.features, (a) => a.properties.type);
-    features.forEach((i) => {
+    let points = _.groupBy(point.features, 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) =>
+    /*    Object.keys(points).map((key) =>
       bus.emit("setGeoJSON", {
         json: turf.featureCollection(
           points[key].map((i) => ({
@@ -306,7 +268,7 @@
       })
     );*/
     // bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
-  /*  newfiberMap
+    /*  newfiberMap
       .getLayers()
       .filter((i) => i.newfiberId == keys[3])[0]
       .getSource()
@@ -316,18 +278,16 @@
 };
 
 function setHighlight_(properties = {}) {
-  const temporary = "temporary";
-  bus.emit("removeMapDatas", [temporary]);
+  const temporary = 'temporary';
+  bus.emit('removeMapDatas', [temporary]);
   if (!properties.geometry) return;
   let geojson = turf.polygonToLine(Terraformer.WKT.parse(properties.geometry));
   geojson = geojson.features ? geojson : turf.featureCollection([geojson]);
-  geojson.features.forEach(
-    (i) => (i.properties = { color: "rgba(255,255,0,1)", type: temporary })
-  );
-  bus.emit("setGeoJSON", { json: geojson, key: temporary });
+  geojson.features.forEach(i => (i.properties = { color: 'rgba(255,255,0,1)', type: temporary }));
+  bus.emit('setGeoJSON', { json: geojson, key: temporary });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "村域边界")[0]
+    .filter(i => i.newfiberId == '村域边界')[0]
     .setData(geojson);
 }
 
@@ -335,8 +295,8 @@
   isClockInRange();
   const { setLayerVisible, setHighlight } = events_params;
   Object.keys(events_params)
-    .filter((key) => events_params[key].method)
-    .forEach((key) => busOn(events_params[key].key, events_params[key].method));
+    .filter(key => events_params[key].method)
+    .forEach(key => busOn(events_params[key].key, events_params[key].method));
   // 获取地图项目数据
   dataToMap({});
   //5分钟刷新一次实时数据1000 * 60 * 5)
@@ -345,29 +305,27 @@
   }, 1000 * 60 * 5);*/
   createPopup();
   busEmit(events_params.closeAllLayer.key);
-  proxy.$emit("loadCallback");
+  proxy.$emit('loadCallback');
   ww();
   ysFlow();
 };
 
 const ysFlow = () => {
-  const key = "雨水系统流向";
+  const key = '雨水系统流向';
   // let features = line.features.filter(i => key.includes(i.properties.area));
   // ys_flow.features = ys_flow.features.concat(features).map(i => ({ ...i, properties: { ...i.properties, color: 'rgba(49,254,223,1)', name: undefined } }));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == key)[0]
+    .filter(i => i.newfiberId == key)[0]
     .setData(ys_flow);
   busEmit(events_params.setGeoJSON.key, { json: ys_flow, key: key + 1 });
 };
 
 const ww = () => {
-  const keys = ["尾水路径"];
+  const keys = ['尾水路径'];
   let features = newfiberMap.map
-    .getSource("hb_wh_dhgx_merge")
-    ._data.features.filter(
-      (i) => i.properties.c_layer.includes(keys[0]) && i.properties.geometry_type == 2
-    );
+    .getSource('hb_wh_dhgx_merge')
+    ._data.features.filter(i => i.properties.c_layer.includes(keys[0]) && i.properties.geometry_type == 2);
   busEmit(events_params.setGeoJSON.key, {
     json: turf.featureCollection(features),
     key: keys[0],
@@ -375,33 +333,29 @@
 };
 
 let prevObj = null;
-const panelDataToMap = (obj) => {
+const panelDataToMap = obj => {
   // debugger
   const { setLayerVisible, setHighlight } = events_params;
   // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false });
   busEmit(setHighlight.key, []);
   // busEmit(setLayerVisible.key, { layername: obj.type, isCheck: true });
   // debugger;
-  let features = ["point", "linestring", "polygon", "hb_wh_dhgx_merge"]
-    .map((key) =>
+  let features = ['point', 'linestring', 'polygon', 'hb_wh_dhgx_merge']
+    .map(key =>
       newfiberMap.map
         .getSource(key)
         ._options.data.features.filter(
-          (i) =>
-            (i.properties.name || "").includes(obj.name) &&
-            (obj.id ? obj.id == i.properties.pid : true)
+          i => (i.properties.name || '').includes(obj.name) && (obj.id ? obj.id == i.properties.pid : true)
         )
     )
     .flat();
-  let feature =
-    features.filter((i) => i.properties.name == obj.name)[0] ||
-    features[_.random(0, features.length - 1)];
+  let feature = features.filter(i => i.properties.name == obj.name)[0] || features[_.random(0, features.length - 1)];
   if (!feature) return;
   busEmit(setHighlight.key, [feature]);
   mapCenterByData(turf.bbox(feature));
 };
 
-const mapCenterByData = (bbox) => {
+const mapCenterByData = bbox => {
   newfiberMap.map.fitBounds(
     [
       [bbox[0], bbox[1]],
@@ -410,29 +364,24 @@
     { padding: 50, offset: [100, 10], maxZoom: 18, pitch: 0, duration: 500 }
   );
 };
-const trajectoryToMap = (data) => {
+const trajectoryToMap = data => {
   clearTrajectory();
-  const fields = { lng: "l", lat: "a" };
-  mapCenterByData([data[0]["l"], data[0]["a"], data[1]["l"], data[1]["a"]].map(Number));
-  newfiberMap.map.trackLayer = new mapboxgl1.TrackLayer(
-    newfiberMap.map,
-    data,
-    fields,
-    (properties, index) => {
-      const lng = properties[fields.lng];
-      const lat = properties[fields.lat];
-      if (!(index % 50)) {
-        newfiberMap.map.flyTo({
-          center: [lng, lat],
-          bearing: newfiberMap.map.getBearing(),
-          pitch: newfiberMap.map.getPitch(),
-          zoom: newfiberMap.map.getZoom(),
-        });
-      }
-      /*        setPopupDom('proxy.$refs.trajectory', 1);
-                            newfiberMap.popup.setLngLat([lng,lat]).addTo(newfiberMap.map);*/
+  const fields = { lng: 'l', lat: 'a' };
+  mapCenterByData([data[0]['l'], data[0]['a'], data[1]['l'], data[1]['a']].map(Number));
+  newfiberMap.map.trackLayer = new mapboxgl1.TrackLayer(newfiberMap.map, data, fields, (properties, index) => {
+    const lng = properties[fields.lng];
+    const lat = properties[fields.lat];
+    if (!(index % 50)) {
+      newfiberMap.map.flyTo({
+        center: [lng, lat],
+        bearing: newfiberMap.map.getBearing(),
+        pitch: newfiberMap.map.getPitch(),
+        zoom: newfiberMap.map.getZoom(),
+      });
     }
-  );
+    /*        setPopupDom('proxy.$refs.trajectory', 1);
+                            newfiberMap.popup.setLngLat([lng,lat]).addTo(newfiberMap.map);*/
+  });
 };
 
 const clearTrajectory = () => {
@@ -445,47 +394,47 @@
   const data_default_params = {
     sites: {
       method: getBaseListPoint,
-      fields: { geometry: "geometry", name: "name" },
-      groupMethod: (data) =>
+      fields: { geometry: 'geometry', name: 'name' },
+      groupMethod: data =>
         _.groupBy(
           data
-            .map((i) => i.data)
+            .map(i => i.data)
             .flat()
-            .filter((i) => i.geometry)
-            .map((item) => ({ ...item })),
-          (v) => v.pointType + (v.connectType ? "_" + v.connectType : "")
+            .filter(i => i.geometry)
+            .map(item => ({ ...item })),
+          v => v.pointType + (v.connectType ? '_' + v.connectType : '')
         ),
     },
     //车辆
     cheliang: {
       method: supervisionRealinformationList,
-      fields: { lng: "longitude", lat: "latitude", name: "plateNumber" },
-      groupMethod: (data) =>
+      fields: { lng: 'longitude', lat: 'latitude', name: 'plateNumber' },
+      groupMethod: data =>
         _.groupBy(
           data.supervisionRealinformationList
-            .filter((i) => i.longitude && i.latitude)
-            .map((item) => ({ ...item, type: item.vehicleCategory + item.status })),
-          (v) => v.type
+            .filter(i => i.longitude && i.latitude)
+            .map(item => ({ ...item, type: item.vehicleCategory + item.status })),
+          v => v.type
         ),
     },
   };
   let keys = Object.keys(params || data_default_params);
   const results = await Promise.all(
-    keys.map((k, idx) =>
-      data_default_params[k].method((params || {})[k] || data_default_params[k].mPrams)
-    )
+    keys.map((k, idx) => data_default_params[k].method((params || {})[k] || data_default_params[k].mPrams))
   );
   results.forEach((result, idx) => {
     const data = result.data;
     const k = keys[idx];
     if (!data) return;
-    bus.emit("changeData");
+    const filteredData = filterGeometryNotEmpty(data);
+    appStore.SET_MapData(filteredData);
+    bus.emit('changeData');
     const groups = data_default_params[k].groupMethod(data);
     const g_keys = Object.keys(groups);
-    bus.emit("removeMapDatas", g_keys);
-    g_keys.forEach((key) =>
+    bus.emit('removeMapDatas', g_keys);
+    g_keys.forEach(key =>
       busEmit(beansToMap.key, {
-        beans: groups[key].map((i) => ({
+        beans: groups[key].map(i => ({
           ...i,
           color: (default_params[key] || {}).color,
         })),
@@ -513,16 +462,16 @@
   f();
   nextTick(f);
   function f() {
-    console.log("eval(dom)", eval(dom));
+    console.log('eval(dom)', eval(dom));
     newfiberMap.popup1.setDOMContent(eval(dom));
     newfiberMap.popup1.setOffset(offset);
   }
 };
 
 function filterGeometryNotEmpty(inputData) {
-  return inputData.map((item) => {
+  return inputData.map(item => {
     // 过滤掉每个对象中的 data 数组里 geometry 为空的元素
-    const filteredData = item.data.filter((dataPoint) => dataPoint.geometry !== "");
+    const filteredData = item.data.filter(dataPoint => dataPoint.geometry !== '');
     return {
       ...item,
       data: filteredData,
@@ -531,29 +480,24 @@
 }
 
 //路径规划
-const pathPlanning = async (
-  origin = "116.481028,39.989643",
-  destination = "116.465302,40.004717",
-  callback
-) => {
-  const origin_ = origin.split(",").map(Number);
-  const destination_ = destination.split(",").map(Number);
-  if (origin_.length != 2 || destination_.length != 2)
-    return console.log("输入参数错误：", origin, destination);
+const pathPlanning = async (origin = '116.481028,39.989643', destination = '116.465302,40.004717', callback) => {
+  const origin_ = origin.split(',').map(Number);
+  const destination_ = destination.split(',').map(Number);
+  if (origin_.length != 2 || destination_.length != 2) return console.log('输入参数错误：', origin, destination);
   const results = await request(
     `/amap/v3/direction/driving?origin=${origin}&destination=${destination}&extensions=all&output=json&key=74f1b47f7fea1971354edb2dfacb3982`
   );
-  if (!results.route.paths[0]) return console.log("暂无路径！");
+  if (!results.route.paths[0]) return console.log('暂无路径！');
   callback &&
     callback(
       turf.featureCollection(
-        results.route.paths[0].steps.map((i) =>
+        results.route.paths[0].steps.map(i =>
           turf.feature(
             Terraformer.WKT.parse(
               `LINESTRING(${i.polyline
-                .split(";")
-                .map((i) => i.split(",").join(" "))
-                .join(",")})`
+                .split(';')
+                .map(i => i.split(',').join(' '))
+                .join(',')})`
             ),
             i
           )
@@ -564,19 +508,19 @@
 
 //判断是否在打卡点内
 const isClockInRange = (
-  currentLocation = "POINT(109.41360117253636 34.49038724464877)",
+  currentLocation = 'POINT(109.41360117253636 34.49038724464877)',
   ranges = [
-    "POINT(109.43167853335872 34.51345940211415)",
-    "POINT(109.46797592891363 34.51145239795833)",
-    "POINT(109.44903576574815 34.50165755773118)",
+    'POINT(109.43167853335872 34.51345940211415)',
+    'POINT(109.46797592891363 34.51145239795833)',
+    'POINT(109.44903576574815 34.50165755773118)',
   ],
   rVal = 500
 ) => {
   const feature = { ...Terraformer.WKT.parse(currentLocation) };
   return (
     ranges
-      .map((i) => turf.buffer({ ...Terraformer.WKT.parse(i) }, rVal / 1000))
-      .map((i) => turf.booleanContains(i, feature))
+      .map(i => turf.buffer({ ...Terraformer.WKT.parse(i) }, rVal / 1000))
+      .map(i => turf.booleanContains(i, feature))
       .filter(Boolean)[0] || false
   );
 };
@@ -584,42 +528,40 @@
 const clearTemporaryData = () => {
   const { setLayerVisible, removeMapDatas } = events_params;
   const keys_ = [
-    "问题管线",
-    "1_泵站",
-    "1_污水处理厂",
-    "1_调蓄池",
-    "分区流向",
-    "分区流向1",
-    "rainwater_pipeline_water_level",
-    "rainwater_pipeline_water_level_GWGSWYX",
-    "outlet_info1",
-    "temporary",
-    "highlight_linestring",
-    "highlight_polygon",
-    "highlight_point",
+    '问题管线',
+    '1_泵站',
+    '1_污水处理厂',
+    '1_调蓄池',
+    '分区流向',
+    '分区流向1',
+    'rainwater_pipeline_water_level',
+    'rainwater_pipeline_water_level_GWGSWYX',
+    'outlet_info1',
+    'temporary',
+    'highlight_linestring',
+    'highlight_polygon',
+    'highlight_point',
   ];
-  const hideKeys = ["雨水系统流向", "雨水系统流向1"];
+  const hideKeys = ['雨水系统流向', '雨水系统流向1'];
   bus.emit(removeMapDatas.key, keys_);
-  const keys = newfiberMap.config_.l7.filter((i) => i.temporary).map((i) => i.key);
+  const keys = newfiberMap.config_.l7.filter(i => i.temporary).map(i => i.key);
   newfiberMap
     .getLayers()
-    .filter((i) => keys.includes(i.newfiberId))
-    .forEach((i) => i.setData({ type: "FeatureCollection", features: [] }));
-  hideKeys.forEach((i) => busEmit(setLayerVisible.key, { layername: i, isCheck: false }));
+    .filter(i => keys.includes(i.newfiberId))
+    .forEach(i => i.setData({ type: 'FeatureCollection', features: [] }));
+  hideKeys.forEach(i => busEmit(setLayerVisible.key, { layername: i, isCheck: false }));
 
   setHighlight_();
 };
 
 const remove3Dtiles = () => {
-  newfiberMap.map._controls
-    .filter((i) => i._deck)
-    .forEach((i) => i.setProps({ layers: [] }));
+  newfiberMap.map._controls.filter(i => i._deck).forEach(i => i.setProps({ layers: [] }));
 };
 
 const load3DTiles = ({ id, url }) => {
   remove3Dtiles();
   let deckOverlay = null;
-  deckOverlay = newfiberMap.map._controls.filter((i) => i._deck)[0];
+  deckOverlay = newfiberMap.map._controls.filter(i => i._deck)[0];
   if (!deckOverlay) {
     deckOverlay = new MapboxOverlay({
       interleaved: true,
@@ -639,15 +581,15 @@
         extruded: true, // 设置3D功能
         opacity: 1, // 设置透明度
         loadOptions: {
-          "3d-tiles": {
+          '3d-tiles': {
             loadGLTF: true,
             decodeQuantizedPositions: false,
-            isTileset: "auto",
+            isTileset: 'auto',
             assetGltfUpAxis: null,
           },
         },
         pickable: true, // 设置可选取
-        onTilesetLoad: (tileset) => {
+        onTilesetLoad: tileset => {
           const { cartographicCenter, zoom } = tileset;
           deckOverlay.setProps({
             initialViewState: {
@@ -667,29 +609,27 @@
 
 const busOn = (event, func) => bus.on(event, func);
 
-const busOff = (event) => bus.off(event);
+const busOff = event => bus.off(event);
 //添加临时动态线
 const addDynamicLine = (c_layer, c_layer1) => {
-  if (newfiberMap.getLayerByName("dynamicLine")) {
-    newfiberMap.removeLayer(newfiberMap.getLayerByName("dynamicLine"));
+  if (newfiberMap.getLayerByName('dynamicLine')) {
+    newfiberMap.removeLayer(newfiberMap.getLayerByName('dynamicLine'));
   }
   let dynamicLineJson = turf.featureCollection(
     newfiberMap.map
-      .getSource("sx_wn_hm_merge")
+      .getSource('sx_wn_hm_merge')
       ._data.features.filter(
-        (feature) =>
-          feature.properties.c_layer.includes(c_layer) &&
-          feature.properties.c_layer.includes(c_layer1)
+        feature => feature.properties.c_layer.includes(c_layer) && feature.properties.c_layer.includes(c_layer1)
       )
   );
   console.log(c_layer, dynamicLineJson);
   let layer = new mapboxL7.LineLayer({
-    name: "dynamicLine",
+    name: 'dynamicLine',
   })
     .source(dynamicLineJson)
     .size(3)
-    .shape("line")
-    .color("color")
+    .shape('line')
+    .color('color')
     .animate({
       interval: 1,
       duration: 2,
@@ -698,28 +638,28 @@
   newfiberMap.addLayer(layer);
 };
 const events_params = {
-  removeMapDatas: { key: "removeMapDatas" },
-  setGeoJSON: { key: "setGeoJSON" },
-  setLayerVisible: { key: "setLayerVisible" },
-  beansToMap: { key: "beansToMap" },
-  closeAllLayer: { key: "closeAllLayer" },
-  setHighlight: { key: "setHighlight" },
-  dataToMap: { key: "dataToMap", method: dataToMap },
-  pathPlanning: { key: "pathPlanning", method: pathPlanning },
-  panelDataToMap: { key: "panelDataToMap", method: panelDataToMap },
-  trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap },
-  clearTrajectory: { key: "clearTrajectory", method: clearTrajectory },
-  clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData },
-  load3DTiles: { key: "load3DTiles", method: load3DTiles },
-  remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles },
+  removeMapDatas: { key: 'removeMapDatas' },
+  setGeoJSON: { key: 'setGeoJSON' },
+  setLayerVisible: { key: 'setLayerVisible' },
+  beansToMap: { key: 'beansToMap' },
+  closeAllLayer: { key: 'closeAllLayer' },
+  setHighlight: { key: 'setHighlight' },
+  dataToMap: { key: 'dataToMap', method: dataToMap },
+  pathPlanning: { key: 'pathPlanning', method: pathPlanning },
+  panelDataToMap: { key: 'panelDataToMap', method: panelDataToMap },
+  trajectoryToMap: { key: 'trajectoryToMap', method: trajectoryToMap },
+  clearTrajectory: { key: 'clearTrajectory', method: clearTrajectory },
+  clearTemporaryData: { key: 'clearTemporaryData', method: clearTemporaryData },
+  load3DTiles: { key: 'load3DTiles', method: load3DTiles },
+  remove3Dtiles: { key: 'remove3Dtiles', method: remove3Dtiles },
   isOpenPanorama: {
-    key: "isOpenPanorama",
-    method: (flag) => (datas.isOpenPanorama = flag),
+    key: 'isOpenPanorama',
+    method: flag => (datas.isOpenPanorama = flag),
   },
 };
 
 onMounted(() => {
-  bus.on("YQ_head", (val) => {
+  bus.on('YQ_head', val => {
     if (val == false) {
       MapShow.value = false;
     } else {
@@ -729,10 +669,10 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("YQ_head");
+  bus.off('YQ_head');
   Object.keys(events_params)
-    .filter((key) => events_params[key].method)
-    .forEach((key) => busOff(events_params[key].key));
+    .filter(key => events_params[key].method)
+    .forEach(key => busOff(events_params[key].key));
   clearInterval(refreshTimer.value); // 清除定时器
   refreshTimer.value = null;
 });
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 103504c..6befe29 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -10,8 +10,12 @@
     roles: [],
     userInfo: {},
     permissions: [],
+    MapData: [],
   }),
   actions: {
+    SET_MapData(MapData) {
+      this.MapData = MapData;
+    },
     // 登录
     login(userInfo) {
       const username = userInfo.username.trim();
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index e6eb365..d7dd72b 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -6,6 +6,7 @@
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
+      <inputSearch></inputSearch>
     </div>
 
     <el-dialog
@@ -48,6 +49,7 @@
 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';
 
 const useStore = usepartitionStore();

diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 384f16e..3303742 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -1,11 +1,5 @@
 <template>
-  <MapBox
-    :initJson="props.initJson"
-    :loadCallback="getModalData"
-    @map-click="mapClickEvt"
-    v-show="MapShow"
-  >
-  </MapBox>
+  <MapBox :initJson="props.initJson" :loadCallback="getModalData" @map-click="mapClickEvt" v-show="MapShow"> </MapBox>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -13,29 +7,29 @@
 </template>
 
 <script setup name="Map">
-import bus from "@/bus";
-import request from "@/utils/request";
-import MapBox from "@/components/Map/Map";
-import { getBaseListPoint } from "@/api/MonitorAssetsOnMap";
-import { supervisionRealinformationList } from "@/api/internetVehicles";
-import useUserStore from "@/store/modules/user";
-import { reactive, onMounted, onBeforeUnmount, nextTick, defineProps, watch } from "vue";
-import streetSpace from "@/components/Map/streetSpace";
-import gq_line from "../../../public/static/libs/mapbox/json/gq_line.json";
-import ys_flow from "../../../public/static/libs/mapbox/json/ys_flow.json";
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { MapboxOverlay } from "@deck.gl/mapbox";
-import { LineLayer, GeoJsonLayer } from "@deck.gl/layers";
-import { TripsLayer, Tile3DLayer } from "@deck.gl/geo-layers";
-import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
+import bus from '@/bus';
+import request from '@/utils/request';
+import MapBox from '@/components/Map/Map';
+import { getBaseListPoint } from '@/api/MonitorAssetsOnMap';
+import { supervisionRealinformationList } from '@/api/internetVehicles';
+import useUserStore from '@/store/modules/user';
+import { reactive, onMounted, onBeforeUnmount, nextTick, defineProps, watch } from 'vue';
+import streetSpace from '@/components/Map/streetSpace';
+import gq_line from '../../../public/static/libs/mapbox/json/gq_line.json';
+import ys_flow from '../../../public/static/libs/mapbox/json/ys_flow.json';
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { MapboxOverlay } from '@deck.gl/mapbox';
+import { LineLayer, GeoJsonLayer } from '@deck.gl/layers';
+import { TripsLayer, Tile3DLayer } from '@deck.gl/geo-layers';
+import { Tiles3DLoader } from '@loaders.gl/3d-tiles';
 const appStore = useUserStore();
 const MapShow = ref(true);
 const props = defineProps({
   // 数据id
   initJson: {
     type: String,
-    default: () => "/static/libs/mapbox/style/wh_dhgx.json",
+    default: () => '/static/libs/mapbox/style/wh_dhgx.json',
   },
   loadCallback: {
     type: Function,
@@ -50,77 +44,77 @@
 const refreshTimer = ref(null);
 const default_params = {
   point: {
-    key: "point",
+    key: 'point',
     prevId: null,
   },
   sx_wn_hm_monitoring: {
-    key: "sx_wn_hm_monitoring",
+    key: 'sx_wn_hm_monitoring',
     prevId: null,
   },
   town: {
-    key: "乡镇",
-    c_key: "村",
+    key: '乡镇',
+    c_key: '村',
     prevId: null,
   },
   hupo: {
-    key: "湖泊",
+    key: '湖泊',
     prevId: null,
   },
   gangqu: {
-    key: "港渠",
+    key: '港渠',
     prevId: null,
   },
   hb_wh_dhgx_merge: {
-    key: "hb_wh_dhgx_merge",
+    key: 'hb_wh_dhgx_merge',
     children: {
-      psfq: { key: "排水分区" },
+      psfq: { key: '排水分区' },
     },
     prevId: null,
   },
-  海绵型水系: { color: "rgba(35,184,153,1)" },
-  海绵建筑与社区: { color: "rgba(255,119,125,1)" },
-  海绵型道路广场: { color: "rgba(255,152,4,1)" },
-  管网及泵站: { color: "rgba(0,153,68,1)" },
-  海绵型公园绿地: { color: "rgba(223,214,20,1)" },
-  flow: { color: "rgba(255,255,255,1)" },
-  rain: { color: "rgba(255,255,255,1)" },
+  海绵型水系: { color: 'rgba(35,184,153,1)' },
+  海绵建筑与社区: { color: 'rgba(255,119,125,1)' },
+  海绵型道路广场: { color: 'rgba(255,152,4,1)' },
+  管网及泵站: { color: 'rgba(0,153,68,1)' },
+  海绵型公园绿地: { color: 'rgba(223,214,20,1)' },
+  flow: { color: 'rgba(255,255,255,1)' },
+  rain: { color: 'rgba(255,255,255,1)' },
 
-  water_level: { color: "rgba(255,255,255,1)" },
-  waterlogging: { color: "rgba(255,255,255,1)" },
+  water_level: { color: 'rgba(255,255,255,1)' },
+  waterlogging: { color: 'rgba(255,255,255,1)' },
 
-  rain_bz: { color: "rgba(255,255,255,1)" },
-  sxt: { color: "rgba(255,255,255,1)" },
-  WSCLC: { color: "rgba(255,255,255,1)" },
-  overflow_outfall: { color: "rgba(255,255,255,1)" },
+  rain_bz: { color: 'rgba(255,255,255,1)' },
+  sxt: { color: 'rgba(255,255,255,1)' },
+  WSCLC: { color: 'rgba(255,255,255,1)' },
+  overflow_outfall: { color: 'rgba(255,255,255,1)' },
 
-  rainfall: { color: "rgba(223,214,20,1)" },
-  pipeline: { color: "rgba(223,214,20,1)" },
-  drain_outlet: { color: "rgba(223,214,20,1)" },
+  rainfall: { color: 'rgba(223,214,20,1)' },
+  pipeline: { color: 'rgba(223,214,20,1)' },
+  drain_outlet: { color: 'rgba(223,214,20,1)' },
 };
-window.mapInitBusName = "mapInitBusName";
+window.mapInitBusName = 'mapInitBusName';
 const mapClickEvt = (lngLat, properties, layerId) => {
   datas.isOpenPanorama &&
     (() => {
-      setPopupDom("proxy.$refs.streetSpace1", 2);
+      setPopupDom('proxy.$refs.streetSpace1', 2);
       newfiberMap.popup1.setLngLat(lngLat).addTo(newfiberMap.map);
       datas.location = lngLat;
     })();
 
-  console.log("properties", properties, layerId);
+  console.log('properties', properties, layerId);
   // 图层点击事件
-  if (properties) bus.emit("FenQuClick", properties);
+  if (properties) bus.emit('FenQuClick', properties);
   clearTrajectory();
   clearTemporaryData();
-  proxy.$emit("map-click1", lngLat, properties, layerId);
+  proxy.$emit('map-click1', lngLat, properties, layerId);
   const { town, hupo, gangqu, hb_wh_dhgx_merge } = default_params;
   const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
-  const _keys = ["rain_water_pump_station_info", "sewage_pump_station_info"];
+  const _keys = ['rain_water_pump_station_info', 'sewage_pump_station_info'];
 
   (() => {
     setHighlight_(properties);
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == "村域边界")[0]
+      .filter(i => i.newfiberId == '村域边界')[0]
       .setData(turf.featureCollection([]));
     if (town.prevId) {
       busEmit(setLayerVisible.key, { layername: town.key, isCheck: true });
@@ -129,20 +123,18 @@
     }
     busEmit(
       removeMapDatas.key,
-      _keys.map((k) => k + 1)
+      _keys.map(k => k + 1)
     );
   })();
-  ((
-    {
+  (
+    ({
       [town.key]: () => {
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == "村域边界")[0]
+          .filter(i => i.newfiberId == '村域边界')[0]
           .setData(
             turf.featureCollection(
-              newfiberMap.map
-                .getSource("hb_wh_gxq_cun2")
-                ._data.features.filter((i) => i.properties.type == properties.name)
+              newfiberMap.map.getSource('hb_wh_gxq_cun2')._data.features.filter(i => i.properties.type == properties.name)
             )
           );
         busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
@@ -154,38 +146,30 @@
           busEmit(setLayerVisible.key, {
             layername: hupo.prevId,
             isCheck: false,
-            values: [hupo.prevId, ["严东湖", "严西湖"].join(",")],
+            values: [hupo.prevId, ['严东湖', '严西湖'].join(',')],
           });
           hupo.prevId = null;
-          bus.emit("removeMapDatas", ["outlet_info1"]);
+          bus.emit('removeMapDatas', ['outlet_info1']);
         }
-        const keys = ["outlet_info", "村域边界", "lake"];
-        const specialKeys = ["严东湖", "严西湖"];
+        const keys = ['outlet_info', '村域边界', 'lake'];
+        const specialKeys = ['严东湖', '严西湖'];
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == keys[1])[0]
-          .setData(
-            turf.featureCollection(
-              gq_line.features.filter((i) => i.properties.w_id == properties.name)
-            )
-          );
+          .filter(i => i.newfiberId == keys[1])[0]
+          .setData(turf.featureCollection(gq_line.features.filter(i => i.properties.w_id == properties.name)));
         let features = newfiberMap.map
-          .getSource("point")
+          .getSource('point')
           ._data.features.filter(
-            (i) =>
-              i.properties.type == keys[0] &&
-              i.properties.waterBodyType == keys[2] &&
-              i.properties.waterBodyId == properties.pid
+            i =>
+              i.properties.type == keys[0] && i.properties.waterBodyType == keys[2] && i.properties.waterBodyId == properties.pid
           )
-          .map((i) => _.cloneDeep(i));
-        features.forEach((i) => (i.properties.type = i.properties.type + "1"));
+          .map(i => _.cloneDeep(i));
+        features.forEach(i => (i.properties.type = i.properties.type + '1'));
         busEmit(events_params.setGeoJSON.key, {
           json: turf.featureCollection(features),
           key: keys[0] + 1,
         });
-        const values = [
-          specialKeys.includes(properties.name) ? specialKeys.join(",") : properties.name,
-        ];
+        const values = [specialKeys.includes(properties.name) ? specialKeys.join(',') : properties.name];
         busEmit(setLayerVisible.key, {
           layername: properties.name,
           isCheck: true,
@@ -196,27 +180,21 @@
       [gangqu.key]: () => {
         if (gangqu.prevId) {
           gangqu.prevId = null;
-          bus.emit("removeMapDatas", ["outlet_info1"]);
+          bus.emit('removeMapDatas', ['outlet_info1']);
         }
-        const keys = ["outlet_info", "村域边界", "channel"];
+        const keys = ['outlet_info', '村域边界', 'channel'];
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == keys[1])[0]
-          .setData(
-            turf.featureCollection(
-              gq_line.features.filter((i) => i.properties.name == properties.name)
-            )
-          );
+          .filter(i => i.newfiberId == keys[1])[0]
+          .setData(turf.featureCollection(gq_line.features.filter(i => i.properties.name == properties.name)));
         let features = newfiberMap.map
-          .getSource("point")
+          .getSource('point')
           ._data.features.filter(
-            (i) =>
-              i.properties.type == keys[0] &&
-              i.properties.waterBodyType == keys[2] &&
-              i.properties.waterBodyId == properties.pid
+            i =>
+              i.properties.type == keys[0] && i.properties.waterBodyType == keys[2] && i.properties.waterBodyId == properties.pid
           )
-          .map((i) => _.cloneDeep(i));
-        features.forEach((i) => (i.properties.type = i.properties.type + "1"));
+          .map(i => _.cloneDeep(i));
+        features.forEach(i => (i.properties.type = i.properties.type + '1'));
         busEmit(events_params.setGeoJSON.key, {
           json: turf.featureCollection(features),
           key: keys[0] + 1,
@@ -225,75 +203,59 @@
       },
       [hb_wh_dhgx_merge.key]: () => {
         if (properties.layer == hb_wh_dhgx_merge.children.psfq.key) {
-          const layerSplit = properties.c_layer.split("_");
+          const layerSplit = properties.c_layer.split('_');
           let geometry = Terraformer.WKT.parse(properties.geometry);
 
           busEmit(setHighlight.key, []);
-          const type = _.chunk(layerSplit[1], 2)[0].join("");
-          let pType = type == "雨水" ? "YS" : "WS";
-          pType == "YS" ? ys_flow(properties, true) : ws_flow(properties);
+          const type = _.chunk(layerSplit[1], 2)[0].join('');
+          let pType = type == '雨水' ? 'YS' : 'WS';
+          pType == 'YS' ? ys_flow(properties, true) : ws_flow(properties);
           if (layerSplit[2] != 3) return mapCenterByData(turf.bbox(geometry));
           let features = newfiberMap.map
-            .getSource("hb_wh_dhgx_pipe_line_n_y_w")
-            ._data.features.filter(
-              (i) =>
-                i.properties[type + "系统"] == properties.name &&
-                i.properties["管段类型"] == pType
-            );
+            .getSource('hb_wh_dhgx_pipe_line_n_y_w')
+            ._data.features.filter(i => i.properties[type + '系统'] == properties.name && i.properties['管段类型'] == pType);
           let pFeatures = newfiberMap.map
-            .getSource("point")
-            ._data.features.filter(
-              (i) =>
-                _keys.includes(i.properties.type) &&
-                (i.properties.pointTypeName || "").includes(type)
-            );
-          let p_features = turf.pointsWithinPolygon(
-            turf.featureCollection(pFeatures),
-            geometry
-          );
-          p_features.features.forEach((i) => (i.properties.type = i.properties.type + 1));
+            .getSource('point')
+            ._data.features.filter(i => _keys.includes(i.properties.type) && (i.properties.pointTypeName || '').includes(type));
+          let p_features = turf.pointsWithinPolygon(turf.featureCollection(pFeatures), geometry);
+          p_features.features.forEach(i => (i.properties.type = i.properties.type + 1));
           busEmit(setGeoJSON.key, { json: p_features });
-          console.log("features", p_features, pFeatures);
-          busEmit(
-            setHighlight.key,
-            turf.flatten(turf.featureCollection(features)).features
-          );
+          console.log('features', p_features, pFeatures);
+          busEmit(setHighlight.key, turf.flatten(turf.featureCollection(features)).features);
         }
       },
-    }[layerId] ||
+    })[layerId] ||
     function () {
       //newfiberMap.map.easeTo(newfiberMap.config_.params.init);
     }
-  )());
+  )();
 
   function ys_flow(properties, visible) {
-    const keys = ["雨水系统流向", "雨水系统流向1"];
-    keys.forEach((key) =>
-      busEmit(setLayerVisible.key, { layername: key, isCheck: visible })
-    );
+    const keys = ['雨水系统流向', '雨水系统流向1'];
+    keys.forEach(key => busEmit(setLayerVisible.key, { layername: key, isCheck: visible }));
     setHighlight_(properties);
   }
 
   function ws_flow(properties) {
-    const keys_ = ["雨水", "污水"];
-    const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-    bus.emit("removeMapDatas", keys);
+    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([]));
-    let key = (properties.c_layer || "").includes(keys_[0]) ? keys_[0] : keys_[1];
+    let key = (properties.c_layer || '').includes(keys_[0]) ? keys_[0] : keys_[1];
     if (properties.pointTypeName) key = keys_[1];
-    const nameKey = "龙王咀" || properties.name.substring(0, 2);
-    let features = line.features.filter((i) => i.properties.area.includes(key));
+    const nameKey = '龙王咀' || properties.name.substring(0, 2);
+    let features = line.features.filter(i => i.properties.area.includes(key));
     // let features1 = point.features.filter(i => i.properties.type.includes(key) );
-    let points = _.groupBy(point.features, (a) => a.properties.type);
-    features.forEach((i) => {
+    let points = _.groupBy(point.features, 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) =>
+    /*    Object.keys(points).map((key) =>
       bus.emit("setGeoJSON", {
         json: turf.featureCollection(
           points[key].map((i) => ({
@@ -306,7 +268,7 @@
       })
     );*/
     // bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
-  /*  newfiberMap
+    /*  newfiberMap
       .getLayers()
       .filter((i) => i.newfiberId == keys[3])[0]
       .getSource()
@@ -316,18 +278,16 @@
 };
 
 function setHighlight_(properties = {}) {
-  const temporary = "temporary";
-  bus.emit("removeMapDatas", [temporary]);
+  const temporary = 'temporary';
+  bus.emit('removeMapDatas', [temporary]);
   if (!properties.geometry) return;
   let geojson = turf.polygonToLine(Terraformer.WKT.parse(properties.geometry));
   geojson = geojson.features ? geojson : turf.featureCollection([geojson]);
-  geojson.features.forEach(
-    (i) => (i.properties = { color: "rgba(255,255,0,1)", type: temporary })
-  );
-  bus.emit("setGeoJSON", { json: geojson, key: temporary });
+  geojson.features.forEach(i => (i.properties = { color: 'rgba(255,255,0,1)', type: temporary }));
+  bus.emit('setGeoJSON', { json: geojson, key: temporary });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "村域边界")[0]
+    .filter(i => i.newfiberId == '村域边界')[0]
     .setData(geojson);
 }
 
@@ -335,8 +295,8 @@
   isClockInRange();
   const { setLayerVisible, setHighlight } = events_params;
   Object.keys(events_params)
-    .filter((key) => events_params[key].method)
-    .forEach((key) => busOn(events_params[key].key, events_params[key].method));
+    .filter(key => events_params[key].method)
+    .forEach(key => busOn(events_params[key].key, events_params[key].method));
   // 获取地图项目数据
   dataToMap({});
   //5分钟刷新一次实时数据1000 * 60 * 5)
@@ -345,29 +305,27 @@
   }, 1000 * 60 * 5);*/
   createPopup();
   busEmit(events_params.closeAllLayer.key);
-  proxy.$emit("loadCallback");
+  proxy.$emit('loadCallback');
   ww();
   ysFlow();
 };
 
 const ysFlow = () => {
-  const key = "雨水系统流向";
+  const key = '雨水系统流向';
   // let features = line.features.filter(i => key.includes(i.properties.area));
   // ys_flow.features = ys_flow.features.concat(features).map(i => ({ ...i, properties: { ...i.properties, color: 'rgba(49,254,223,1)', name: undefined } }));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == key)[0]
+    .filter(i => i.newfiberId == key)[0]
     .setData(ys_flow);
   busEmit(events_params.setGeoJSON.key, { json: ys_flow, key: key + 1 });
 };
 
 const ww = () => {
-  const keys = ["尾水路径"];
+  const keys = ['尾水路径'];
   let features = newfiberMap.map
-    .getSource("hb_wh_dhgx_merge")
-    ._data.features.filter(
-      (i) => i.properties.c_layer.includes(keys[0]) && i.properties.geometry_type == 2
-    );
+    .getSource('hb_wh_dhgx_merge')
+    ._data.features.filter(i => i.properties.c_layer.includes(keys[0]) && i.properties.geometry_type == 2);
   busEmit(events_params.setGeoJSON.key, {
     json: turf.featureCollection(features),
     key: keys[0],
@@ -375,33 +333,29 @@
 };
 
 let prevObj = null;
-const panelDataToMap = (obj) => {
+const panelDataToMap = obj => {
   // debugger
   const { setLayerVisible, setHighlight } = events_params;
   // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false });
   busEmit(setHighlight.key, []);
   // busEmit(setLayerVisible.key, { layername: obj.type, isCheck: true });
   // debugger;
-  let features = ["point", "linestring", "polygon", "hb_wh_dhgx_merge"]
-    .map((key) =>
+  let features = ['point', 'linestring', 'polygon', 'hb_wh_dhgx_merge']
+    .map(key =>
       newfiberMap.map
         .getSource(key)
         ._options.data.features.filter(
-          (i) =>
-            (i.properties.name || "").includes(obj.name) &&
-            (obj.id ? obj.id == i.properties.pid : true)
+          i => (i.properties.name || '').includes(obj.name) && (obj.id ? obj.id == i.properties.pid : true)
         )
     )
     .flat();
-  let feature =
-    features.filter((i) => i.properties.name == obj.name)[0] ||
-    features[_.random(0, features.length - 1)];
+  let feature = features.filter(i => i.properties.name == obj.name)[0] || features[_.random(0, features.length - 1)];
   if (!feature) return;
   busEmit(setHighlight.key, [feature]);
   mapCenterByData(turf.bbox(feature));
 };
 
-const mapCenterByData = (bbox) => {
+const mapCenterByData = bbox => {
   newfiberMap.map.fitBounds(
     [
       [bbox[0], bbox[1]],
@@ -410,29 +364,24 @@
     { padding: 50, offset: [100, 10], maxZoom: 18, pitch: 0, duration: 500 }
   );
 };
-const trajectoryToMap = (data) => {
+const trajectoryToMap = data => {
   clearTrajectory();
-  const fields = { lng: "l", lat: "a" };
-  mapCenterByData([data[0]["l"], data[0]["a"], data[1]["l"], data[1]["a"]].map(Number));
-  newfiberMap.map.trackLayer = new mapboxgl1.TrackLayer(
-    newfiberMap.map,
-    data,
-    fields,
-    (properties, index) => {
-      const lng = properties[fields.lng];
-      const lat = properties[fields.lat];
-      if (!(index % 50)) {
-        newfiberMap.map.flyTo({
-          center: [lng, lat],
-          bearing: newfiberMap.map.getBearing(),
-          pitch: newfiberMap.map.getPitch(),
-          zoom: newfiberMap.map.getZoom(),
-        });
-      }
-      /*        setPopupDom('proxy.$refs.trajectory', 1);
-                            newfiberMap.popup.setLngLat([lng,lat]).addTo(newfiberMap.map);*/
+  const fields = { lng: 'l', lat: 'a' };
+  mapCenterByData([data[0]['l'], data[0]['a'], data[1]['l'], data[1]['a']].map(Number));
+  newfiberMap.map.trackLayer = new mapboxgl1.TrackLayer(newfiberMap.map, data, fields, (properties, index) => {
+    const lng = properties[fields.lng];
+    const lat = properties[fields.lat];
+    if (!(index % 50)) {
+      newfiberMap.map.flyTo({
+        center: [lng, lat],
+        bearing: newfiberMap.map.getBearing(),
+        pitch: newfiberMap.map.getPitch(),
+        zoom: newfiberMap.map.getZoom(),
+      });
     }
-  );
+    /*        setPopupDom('proxy.$refs.trajectory', 1);
+                            newfiberMap.popup.setLngLat([lng,lat]).addTo(newfiberMap.map);*/
+  });
 };
 
 const clearTrajectory = () => {
@@ -445,47 +394,47 @@
   const data_default_params = {
     sites: {
       method: getBaseListPoint,
-      fields: { geometry: "geometry", name: "name" },
-      groupMethod: (data) =>
+      fields: { geometry: 'geometry', name: 'name' },
+      groupMethod: data =>
         _.groupBy(
           data
-            .map((i) => i.data)
+            .map(i => i.data)
             .flat()
-            .filter((i) => i.geometry)
-            .map((item) => ({ ...item })),
-          (v) => v.pointType + (v.connectType ? "_" + v.connectType : "")
+            .filter(i => i.geometry)
+            .map(item => ({ ...item })),
+          v => v.pointType + (v.connectType ? '_' + v.connectType : '')
         ),
     },
     //车辆
     cheliang: {
       method: supervisionRealinformationList,
-      fields: { lng: "longitude", lat: "latitude", name: "plateNumber" },
-      groupMethod: (data) =>
+      fields: { lng: 'longitude', lat: 'latitude', name: 'plateNumber' },
+      groupMethod: data =>
         _.groupBy(
           data.supervisionRealinformationList
-            .filter((i) => i.longitude && i.latitude)
-            .map((item) => ({ ...item, type: item.vehicleCategory + item.status })),
-          (v) => v.type
+            .filter(i => i.longitude && i.latitude)
+            .map(item => ({ ...item, type: item.vehicleCategory + item.status })),
+          v => v.type
         ),
     },
   };
   let keys = Object.keys(params || data_default_params);
   const results = await Promise.all(
-    keys.map((k, idx) =>
-      data_default_params[k].method((params || {})[k] || data_default_params[k].mPrams)
-    )
+    keys.map((k, idx) => data_default_params[k].method((params || {})[k] || data_default_params[k].mPrams))
   );
   results.forEach((result, idx) => {
     const data = result.data;
     const k = keys[idx];
     if (!data) return;
-    bus.emit("changeData");
+    const filteredData = filterGeometryNotEmpty(data);
+    appStore.SET_MapData(filteredData);
+    bus.emit('changeData');
     const groups = data_default_params[k].groupMethod(data);
     const g_keys = Object.keys(groups);
-    bus.emit("removeMapDatas", g_keys);
-    g_keys.forEach((key) =>
+    bus.emit('removeMapDatas', g_keys);
+    g_keys.forEach(key =>
       busEmit(beansToMap.key, {
-        beans: groups[key].map((i) => ({
+        beans: groups[key].map(i => ({
           ...i,
           color: (default_params[key] || {}).color,
         })),
@@ -513,16 +462,16 @@
   f();
   nextTick(f);
   function f() {
-    console.log("eval(dom)", eval(dom));
+    console.log('eval(dom)', eval(dom));
     newfiberMap.popup1.setDOMContent(eval(dom));
     newfiberMap.popup1.setOffset(offset);
   }
 };
 
 function filterGeometryNotEmpty(inputData) {
-  return inputData.map((item) => {
+  return inputData.map(item => {
     // 过滤掉每个对象中的 data 数组里 geometry 为空的元素
-    const filteredData = item.data.filter((dataPoint) => dataPoint.geometry !== "");
+    const filteredData = item.data.filter(dataPoint => dataPoint.geometry !== '');
     return {
       ...item,
       data: filteredData,
@@ -531,29 +480,24 @@
 }
 
 //路径规划
-const pathPlanning = async (
-  origin = "116.481028,39.989643",
-  destination = "116.465302,40.004717",
-  callback
-) => {
-  const origin_ = origin.split(",").map(Number);
-  const destination_ = destination.split(",").map(Number);
-  if (origin_.length != 2 || destination_.length != 2)
-    return console.log("输入参数错误：", origin, destination);
+const pathPlanning = async (origin = '116.481028,39.989643', destination = '116.465302,40.004717', callback) => {
+  const origin_ = origin.split(',').map(Number);
+  const destination_ = destination.split(',').map(Number);
+  if (origin_.length != 2 || destination_.length != 2) return console.log('输入参数错误：', origin, destination);
   const results = await request(
     `/amap/v3/direction/driving?origin=${origin}&destination=${destination}&extensions=all&output=json&key=74f1b47f7fea1971354edb2dfacb3982`
   );
-  if (!results.route.paths[0]) return console.log("暂无路径！");
+  if (!results.route.paths[0]) return console.log('暂无路径！');
   callback &&
     callback(
       turf.featureCollection(
-        results.route.paths[0].steps.map((i) =>
+        results.route.paths[0].steps.map(i =>
           turf.feature(
             Terraformer.WKT.parse(
               `LINESTRING(${i.polyline
-                .split(";")
-                .map((i) => i.split(",").join(" "))
-                .join(",")})`
+                .split(';')
+                .map(i => i.split(',').join(' '))
+                .join(',')})`
             ),
             i
           )
@@ -564,19 +508,19 @@
 
 //判断是否在打卡点内
 const isClockInRange = (
-  currentLocation = "POINT(109.41360117253636 34.49038724464877)",
+  currentLocation = 'POINT(109.41360117253636 34.49038724464877)',
   ranges = [
-    "POINT(109.43167853335872 34.51345940211415)",
-    "POINT(109.46797592891363 34.51145239795833)",
-    "POINT(109.44903576574815 34.50165755773118)",
+    'POINT(109.43167853335872 34.51345940211415)',
+    'POINT(109.46797592891363 34.51145239795833)',
+    'POINT(109.44903576574815 34.50165755773118)',
   ],
   rVal = 500
 ) => {
   const feature = { ...Terraformer.WKT.parse(currentLocation) };
   return (
     ranges
-      .map((i) => turf.buffer({ ...Terraformer.WKT.parse(i) }, rVal / 1000))
-      .map((i) => turf.booleanContains(i, feature))
+      .map(i => turf.buffer({ ...Terraformer.WKT.parse(i) }, rVal / 1000))
+      .map(i => turf.booleanContains(i, feature))
       .filter(Boolean)[0] || false
   );
 };
@@ -584,42 +528,40 @@
 const clearTemporaryData = () => {
   const { setLayerVisible, removeMapDatas } = events_params;
   const keys_ = [
-    "问题管线",
-    "1_泵站",
-    "1_污水处理厂",
-    "1_调蓄池",
-    "分区流向",
-    "分区流向1",
-    "rainwater_pipeline_water_level",
-    "rainwater_pipeline_water_level_GWGSWYX",
-    "outlet_info1",
-    "temporary",
-    "highlight_linestring",
-    "highlight_polygon",
-    "highlight_point",
+    '问题管线',
+    '1_泵站',
+    '1_污水处理厂',
+    '1_调蓄池',
+    '分区流向',
+    '分区流向1',
+    'rainwater_pipeline_water_level',
+    'rainwater_pipeline_water_level_GWGSWYX',
+    'outlet_info1',
+    'temporary',
+    'highlight_linestring',
+    'highlight_polygon',
+    'highlight_point',
   ];
-  const hideKeys = ["雨水系统流向", "雨水系统流向1"];
+  const hideKeys = ['雨水系统流向', '雨水系统流向1'];
   bus.emit(removeMapDatas.key, keys_);
-  const keys = newfiberMap.config_.l7.filter((i) => i.temporary).map((i) => i.key);
+  const keys = newfiberMap.config_.l7.filter(i => i.temporary).map(i => i.key);
   newfiberMap
     .getLayers()
-    .filter((i) => keys.includes(i.newfiberId))
-    .forEach((i) => i.setData({ type: "FeatureCollection", features: [] }));
-  hideKeys.forEach((i) => busEmit(setLayerVisible.key, { layername: i, isCheck: false }));
+    .filter(i => keys.includes(i.newfiberId))
+    .forEach(i => i.setData({ type: 'FeatureCollection', features: [] }));
+  hideKeys.forEach(i => busEmit(setLayerVisible.key, { layername: i, isCheck: false }));
 
   setHighlight_();
 };
 
 const remove3Dtiles = () => {
-  newfiberMap.map._controls
-    .filter((i) => i._deck)
-    .forEach((i) => i.setProps({ layers: [] }));
+  newfiberMap.map._controls.filter(i => i._deck).forEach(i => i.setProps({ layers: [] }));
 };
 
 const load3DTiles = ({ id, url }) => {
   remove3Dtiles();
   let deckOverlay = null;
-  deckOverlay = newfiberMap.map._controls.filter((i) => i._deck)[0];
+  deckOverlay = newfiberMap.map._controls.filter(i => i._deck)[0];
   if (!deckOverlay) {
     deckOverlay = new MapboxOverlay({
       interleaved: true,
@@ -639,15 +581,15 @@
         extruded: true, // 设置3D功能
         opacity: 1, // 设置透明度
         loadOptions: {
-          "3d-tiles": {
+          '3d-tiles': {
             loadGLTF: true,
             decodeQuantizedPositions: false,
-            isTileset: "auto",
+            isTileset: 'auto',
             assetGltfUpAxis: null,
           },
         },
         pickable: true, // 设置可选取
-        onTilesetLoad: (tileset) => {
+        onTilesetLoad: tileset => {
           const { cartographicCenter, zoom } = tileset;
           deckOverlay.setProps({
             initialViewState: {
@@ -667,29 +609,27 @@
 
 const busOn = (event, func) => bus.on(event, func);
 
-const busOff = (event) => bus.off(event);
+const busOff = event => bus.off(event);
 //添加临时动态线
 const addDynamicLine = (c_layer, c_layer1) => {
-  if (newfiberMap.getLayerByName("dynamicLine")) {
-    newfiberMap.removeLayer(newfiberMap.getLayerByName("dynamicLine"));
+  if (newfiberMap.getLayerByName('dynamicLine')) {
+    newfiberMap.removeLayer(newfiberMap.getLayerByName('dynamicLine'));
   }
   let dynamicLineJson = turf.featureCollection(
     newfiberMap.map
-      .getSource("sx_wn_hm_merge")
+      .getSource('sx_wn_hm_merge')
       ._data.features.filter(
-        (feature) =>
-          feature.properties.c_layer.includes(c_layer) &&
-          feature.properties.c_layer.includes(c_layer1)
+        feature => feature.properties.c_layer.includes(c_layer) && feature.properties.c_layer.includes(c_layer1)
       )
   );
   console.log(c_layer, dynamicLineJson);
   let layer = new mapboxL7.LineLayer({
-    name: "dynamicLine",
+    name: 'dynamicLine',
   })
     .source(dynamicLineJson)
     .size(3)
-    .shape("line")
-    .color("color")
+    .shape('line')
+    .color('color')
     .animate({
       interval: 1,
       duration: 2,
@@ -698,28 +638,28 @@
   newfiberMap.addLayer(layer);
 };
 const events_params = {
-  removeMapDatas: { key: "removeMapDatas" },
-  setGeoJSON: { key: "setGeoJSON" },
-  setLayerVisible: { key: "setLayerVisible" },
-  beansToMap: { key: "beansToMap" },
-  closeAllLayer: { key: "closeAllLayer" },
-  setHighlight: { key: "setHighlight" },
-  dataToMap: { key: "dataToMap", method: dataToMap },
-  pathPlanning: { key: "pathPlanning", method: pathPlanning },
-  panelDataToMap: { key: "panelDataToMap", method: panelDataToMap },
-  trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap },
-  clearTrajectory: { key: "clearTrajectory", method: clearTrajectory },
-  clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData },
-  load3DTiles: { key: "load3DTiles", method: load3DTiles },
-  remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles },
+  removeMapDatas: { key: 'removeMapDatas' },
+  setGeoJSON: { key: 'setGeoJSON' },
+  setLayerVisible: { key: 'setLayerVisible' },
+  beansToMap: { key: 'beansToMap' },
+  closeAllLayer: { key: 'closeAllLayer' },
+  setHighlight: { key: 'setHighlight' },
+  dataToMap: { key: 'dataToMap', method: dataToMap },
+  pathPlanning: { key: 'pathPlanning', method: pathPlanning },
+  panelDataToMap: { key: 'panelDataToMap', method: panelDataToMap },
+  trajectoryToMap: { key: 'trajectoryToMap', method: trajectoryToMap },
+  clearTrajectory: { key: 'clearTrajectory', method: clearTrajectory },
+  clearTemporaryData: { key: 'clearTemporaryData', method: clearTemporaryData },
+  load3DTiles: { key: 'load3DTiles', method: load3DTiles },
+  remove3Dtiles: { key: 'remove3Dtiles', method: remove3Dtiles },
   isOpenPanorama: {
-    key: "isOpenPanorama",
-    method: (flag) => (datas.isOpenPanorama = flag),
+    key: 'isOpenPanorama',
+    method: flag => (datas.isOpenPanorama = flag),
   },
 };
 
 onMounted(() => {
-  bus.on("YQ_head", (val) => {
+  bus.on('YQ_head', val => {
     if (val == false) {
       MapShow.value = false;
     } else {
@@ -729,10 +669,10 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("YQ_head");
+  bus.off('YQ_head');
   Object.keys(events_params)
-    .filter((key) => events_params[key].method)
-    .forEach((key) => busOff(events_params[key].key));
+    .filter(key => events_params[key].method)
+    .forEach(key => busOff(events_params[key].key));
   clearInterval(refreshTimer.value); // 清除定时器
   refreshTimer.value = null;
 });
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 103504c..6befe29 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -10,8 +10,12 @@
     roles: [],
     userInfo: {},
     permissions: [],
+    MapData: [],
   }),
   actions: {
+    SET_MapData(MapData) {
+      this.MapData = MapData;
+    },
     // 登录
     login(userInfo) {
       const username = userInfo.username.trim();
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index e6eb365..d7dd72b 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -6,6 +6,7 @@
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
+      <inputSearch></inputSearch>
     </div>
 
     <el-dialog
@@ -48,6 +49,7 @@
 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';
 
 const useStore = usepartitionStore();
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
new file mode 100644
index 0000000..282aa28
--- /dev/null
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="inputSearch" v-show="Show && number == 4">
+    <el-select
+      v-model="selectmodel"
+      placeholder="输入关键字搜索"
+      style="width: 180px"
+      filterable
+      :filter-method="filterMethod"
+      clearable
+      @change="selectchange"
+    >
+      <el-option v-for="(item, index) in filterList" :key="item.id + index + item.id" :label="item.name" :value="item.geometry">
+        <el-popover v-if="item.name.length >= 15" placement="top-start" width="300" trigger="hover" popper-class="popperclass">
+          <span>{{ item.name }}</span>
+          <template #reference>
+            {{ item.name.slice(0, 15) + '...' }}
+          </template>
+        </el-popover>
+        <span v-else>{{ item.name }}</span>
+        <span style="float: right; color: var(--el-text-color-secondary); font-size: 13px">
+          {{ item.pointTypeName }}
+        </span>
+      </el-option>
+    </el-select>
+  </div>
+</template>
+<script setup>
+import bus from '@/bus/';
+import useUserStore from '@/store/modules/user';
+const appStore = useUserStore();
+const { proxy } = getCurrentInstance();
+const Show = ref(true);
+
+const props = defineProps({
+  diabox: {
+    type: Object,
+  },
+});
+
+const number = ref(1);
+const SelectList = ref(1);
+const filterList = ref([]);
+const selectmodel = ref('');
+const getItem = ref({});
+watch(
+  () => appStore.MapData,
+  (newValue, oldValue) => {
+    if (appStore.MapData && appStore.MapData.length) {
+      if (number.value === 1) {
+        GetSearchList();
+        number.value = 4;
+      }
+    }
+    // 示例调用
+  },
+  { deep: true, once: true }
+);
+
+function GetSearchList() {
+  SelectList.value = [];
+  appStore.MapData.map(item => {
+    SelectList.value = SelectList.value.concat(item.data);
+  });
+  console.log('MapData', appStore.MapData, SelectList.value);
+  filterList.value = JSON.parse(JSON.stringify(SelectList.value));
+}
+
+// 值改变后的操作
+function selectchange(value) {
+  if (value) {
+    // 选中的操作
+    let arr = SelectList.value.filter(item => {
+      return item.geometry == value;
+    });
+    if (arr && arr[0]) {
+      getItem.value = arr[0];
+    }
+    console.log('选中change', getItem.value);
+  } else {
+    // 清除的操作
+    console.log('清除change', getItem.value);
+  }
+}
+
+function filterMethod(value) {
+  console.log('filterMethod', value);
+  if (value) {
+    filterList.value = SelectList.value.filter(item => item.name.includes(value));
+  } else {
+    filterList.value = SelectList.value;
+  }
+}
+
+onMounted(() => {
+  bus.on('YQ_head', val => {
+    if (val == false) {
+      Show.value = false;
+    } else {
+      Show.value = true;
+    }
+  });
+});
+
+onBeforeUnmount(() => {
+  bus.off('YQ_head');
+});
+</script>
+<style lang="scss" scoped>
+.inputSearch {
+  position: fixed;
+  right: 155px;
+  top: 19px;
+  z-index: 999;
+}
+
+:deep(.el-input__wrapper) {
+  background: #032d79 !important;
+}
+
+:deep(.el-input__inner) {
+  color: #fff;
+}
+
+.popperclass {
+  z-index: 10000 !important;
+}
+</style>

diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 384f16e..3303742 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -1,11 +1,5 @@
 <template>
-  <MapBox
-    :initJson="props.initJson"
-    :loadCallback="getModalData"
-    @map-click="mapClickEvt"
-    v-show="MapShow"
-  >
-  </MapBox>
+  <MapBox :initJson="props.initJson" :loadCallback="getModalData" @map-click="mapClickEvt" v-show="MapShow"> </MapBox>
   <!-- <div id="trajectory-popup" ref="trajectory">1111</div> -->
   <!-- <div style="width: 700px; height: 350px" ref="streetSpace1" id="streetSpace1">
     <streetSpace :location="datas.location"></streetSpace>
@@ -13,29 +7,29 @@
 </template>
 
 <script setup name="Map">
-import bus from "@/bus";
-import request from "@/utils/request";
-import MapBox from "@/components/Map/Map";
-import { getBaseListPoint } from "@/api/MonitorAssetsOnMap";
-import { supervisionRealinformationList } from "@/api/internetVehicles";
-import useUserStore from "@/store/modules/user";
-import { reactive, onMounted, onBeforeUnmount, nextTick, defineProps, watch } from "vue";
-import streetSpace from "@/components/Map/streetSpace";
-import gq_line from "../../../public/static/libs/mapbox/json/gq_line.json";
-import ys_flow from "../../../public/static/libs/mapbox/json/ys_flow.json";
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { MapboxOverlay } from "@deck.gl/mapbox";
-import { LineLayer, GeoJsonLayer } from "@deck.gl/layers";
-import { TripsLayer, Tile3DLayer } from "@deck.gl/geo-layers";
-import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
+import bus from '@/bus';
+import request from '@/utils/request';
+import MapBox from '@/components/Map/Map';
+import { getBaseListPoint } from '@/api/MonitorAssetsOnMap';
+import { supervisionRealinformationList } from '@/api/internetVehicles';
+import useUserStore from '@/store/modules/user';
+import { reactive, onMounted, onBeforeUnmount, nextTick, defineProps, watch } from 'vue';
+import streetSpace from '@/components/Map/streetSpace';
+import gq_line from '../../../public/static/libs/mapbox/json/gq_line.json';
+import ys_flow from '../../../public/static/libs/mapbox/json/ys_flow.json';
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { MapboxOverlay } from '@deck.gl/mapbox';
+import { LineLayer, GeoJsonLayer } from '@deck.gl/layers';
+import { TripsLayer, Tile3DLayer } from '@deck.gl/geo-layers';
+import { Tiles3DLoader } from '@loaders.gl/3d-tiles';
 const appStore = useUserStore();
 const MapShow = ref(true);
 const props = defineProps({
   // 数据id
   initJson: {
     type: String,
-    default: () => "/static/libs/mapbox/style/wh_dhgx.json",
+    default: () => '/static/libs/mapbox/style/wh_dhgx.json',
   },
   loadCallback: {
     type: Function,
@@ -50,77 +44,77 @@
 const refreshTimer = ref(null);
 const default_params = {
   point: {
-    key: "point",
+    key: 'point',
     prevId: null,
   },
   sx_wn_hm_monitoring: {
-    key: "sx_wn_hm_monitoring",
+    key: 'sx_wn_hm_monitoring',
     prevId: null,
   },
   town: {
-    key: "乡镇",
-    c_key: "村",
+    key: '乡镇',
+    c_key: '村',
     prevId: null,
   },
   hupo: {
-    key: "湖泊",
+    key: '湖泊',
     prevId: null,
   },
   gangqu: {
-    key: "港渠",
+    key: '港渠',
     prevId: null,
   },
   hb_wh_dhgx_merge: {
-    key: "hb_wh_dhgx_merge",
+    key: 'hb_wh_dhgx_merge',
     children: {
-      psfq: { key: "排水分区" },
+      psfq: { key: '排水分区' },
     },
     prevId: null,
   },
-  海绵型水系: { color: "rgba(35,184,153,1)" },
-  海绵建筑与社区: { color: "rgba(255,119,125,1)" },
-  海绵型道路广场: { color: "rgba(255,152,4,1)" },
-  管网及泵站: { color: "rgba(0,153,68,1)" },
-  海绵型公园绿地: { color: "rgba(223,214,20,1)" },
-  flow: { color: "rgba(255,255,255,1)" },
-  rain: { color: "rgba(255,255,255,1)" },
+  海绵型水系: { color: 'rgba(35,184,153,1)' },
+  海绵建筑与社区: { color: 'rgba(255,119,125,1)' },
+  海绵型道路广场: { color: 'rgba(255,152,4,1)' },
+  管网及泵站: { color: 'rgba(0,153,68,1)' },
+  海绵型公园绿地: { color: 'rgba(223,214,20,1)' },
+  flow: { color: 'rgba(255,255,255,1)' },
+  rain: { color: 'rgba(255,255,255,1)' },
 
-  water_level: { color: "rgba(255,255,255,1)" },
-  waterlogging: { color: "rgba(255,255,255,1)" },
+  water_level: { color: 'rgba(255,255,255,1)' },
+  waterlogging: { color: 'rgba(255,255,255,1)' },
 
-  rain_bz: { color: "rgba(255,255,255,1)" },
-  sxt: { color: "rgba(255,255,255,1)" },
-  WSCLC: { color: "rgba(255,255,255,1)" },
-  overflow_outfall: { color: "rgba(255,255,255,1)" },
+  rain_bz: { color: 'rgba(255,255,255,1)' },
+  sxt: { color: 'rgba(255,255,255,1)' },
+  WSCLC: { color: 'rgba(255,255,255,1)' },
+  overflow_outfall: { color: 'rgba(255,255,255,1)' },
 
-  rainfall: { color: "rgba(223,214,20,1)" },
-  pipeline: { color: "rgba(223,214,20,1)" },
-  drain_outlet: { color: "rgba(223,214,20,1)" },
+  rainfall: { color: 'rgba(223,214,20,1)' },
+  pipeline: { color: 'rgba(223,214,20,1)' },
+  drain_outlet: { color: 'rgba(223,214,20,1)' },
 };
-window.mapInitBusName = "mapInitBusName";
+window.mapInitBusName = 'mapInitBusName';
 const mapClickEvt = (lngLat, properties, layerId) => {
   datas.isOpenPanorama &&
     (() => {
-      setPopupDom("proxy.$refs.streetSpace1", 2);
+      setPopupDom('proxy.$refs.streetSpace1', 2);
       newfiberMap.popup1.setLngLat(lngLat).addTo(newfiberMap.map);
       datas.location = lngLat;
     })();
 
-  console.log("properties", properties, layerId);
+  console.log('properties', properties, layerId);
   // 图层点击事件
-  if (properties) bus.emit("FenQuClick", properties);
+  if (properties) bus.emit('FenQuClick', properties);
   clearTrajectory();
   clearTemporaryData();
-  proxy.$emit("map-click1", lngLat, properties, layerId);
+  proxy.$emit('map-click1', lngLat, properties, layerId);
   const { town, hupo, gangqu, hb_wh_dhgx_merge } = default_params;
   const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
-  const _keys = ["rain_water_pump_station_info", "sewage_pump_station_info"];
+  const _keys = ['rain_water_pump_station_info', 'sewage_pump_station_info'];
 
   (() => {
     setHighlight_(properties);
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == "村域边界")[0]
+      .filter(i => i.newfiberId == '村域边界')[0]
       .setData(turf.featureCollection([]));
     if (town.prevId) {
       busEmit(setLayerVisible.key, { layername: town.key, isCheck: true });
@@ -129,20 +123,18 @@
     }
     busEmit(
       removeMapDatas.key,
-      _keys.map((k) => k + 1)
+      _keys.map(k => k + 1)
     );
   })();
-  ((
-    {
+  (
+    ({
       [town.key]: () => {
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == "村域边界")[0]
+          .filter(i => i.newfiberId == '村域边界')[0]
           .setData(
             turf.featureCollection(
-              newfiberMap.map
-                .getSource("hb_wh_gxq_cun2")
-                ._data.features.filter((i) => i.properties.type == properties.name)
+              newfiberMap.map.getSource('hb_wh_gxq_cun2')._data.features.filter(i => i.properties.type == properties.name)
             )
           );
         busEmit(setLayerVisible.key, { layername: town.key, isCheck: false });
@@ -154,38 +146,30 @@
           busEmit(setLayerVisible.key, {
             layername: hupo.prevId,
             isCheck: false,
-            values: [hupo.prevId, ["严东湖", "严西湖"].join(",")],
+            values: [hupo.prevId, ['严东湖', '严西湖'].join(',')],
           });
           hupo.prevId = null;
-          bus.emit("removeMapDatas", ["outlet_info1"]);
+          bus.emit('removeMapDatas', ['outlet_info1']);
         }
-        const keys = ["outlet_info", "村域边界", "lake"];
-        const specialKeys = ["严东湖", "严西湖"];
+        const keys = ['outlet_info', '村域边界', 'lake'];
+        const specialKeys = ['严东湖', '严西湖'];
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == keys[1])[0]
-          .setData(
-            turf.featureCollection(
-              gq_line.features.filter((i) => i.properties.w_id == properties.name)
-            )
-          );
+          .filter(i => i.newfiberId == keys[1])[0]
+          .setData(turf.featureCollection(gq_line.features.filter(i => i.properties.w_id == properties.name)));
         let features = newfiberMap.map
-          .getSource("point")
+          .getSource('point')
           ._data.features.filter(
-            (i) =>
-              i.properties.type == keys[0] &&
-              i.properties.waterBodyType == keys[2] &&
-              i.properties.waterBodyId == properties.pid
+            i =>
+              i.properties.type == keys[0] && i.properties.waterBodyType == keys[2] && i.properties.waterBodyId == properties.pid
           )
-          .map((i) => _.cloneDeep(i));
-        features.forEach((i) => (i.properties.type = i.properties.type + "1"));
+          .map(i => _.cloneDeep(i));
+        features.forEach(i => (i.properties.type = i.properties.type + '1'));
         busEmit(events_params.setGeoJSON.key, {
           json: turf.featureCollection(features),
           key: keys[0] + 1,
         });
-        const values = [
-          specialKeys.includes(properties.name) ? specialKeys.join(",") : properties.name,
-        ];
+        const values = [specialKeys.includes(properties.name) ? specialKeys.join(',') : properties.name];
         busEmit(setLayerVisible.key, {
           layername: properties.name,
           isCheck: true,
@@ -196,27 +180,21 @@
       [gangqu.key]: () => {
         if (gangqu.prevId) {
           gangqu.prevId = null;
-          bus.emit("removeMapDatas", ["outlet_info1"]);
+          bus.emit('removeMapDatas', ['outlet_info1']);
         }
-        const keys = ["outlet_info", "村域边界", "channel"];
+        const keys = ['outlet_info', '村域边界', 'channel'];
         newfiberMap
           .getLayers()
-          .filter((i) => i.newfiberId == keys[1])[0]
-          .setData(
-            turf.featureCollection(
-              gq_line.features.filter((i) => i.properties.name == properties.name)
-            )
-          );
+          .filter(i => i.newfiberId == keys[1])[0]
+          .setData(turf.featureCollection(gq_line.features.filter(i => i.properties.name == properties.name)));
         let features = newfiberMap.map
-          .getSource("point")
+          .getSource('point')
           ._data.features.filter(
-            (i) =>
-              i.properties.type == keys[0] &&
-              i.properties.waterBodyType == keys[2] &&
-              i.properties.waterBodyId == properties.pid
+            i =>
+              i.properties.type == keys[0] && i.properties.waterBodyType == keys[2] && i.properties.waterBodyId == properties.pid
           )
-          .map((i) => _.cloneDeep(i));
-        features.forEach((i) => (i.properties.type = i.properties.type + "1"));
+          .map(i => _.cloneDeep(i));
+        features.forEach(i => (i.properties.type = i.properties.type + '1'));
         busEmit(events_params.setGeoJSON.key, {
           json: turf.featureCollection(features),
           key: keys[0] + 1,
@@ -225,75 +203,59 @@
       },
       [hb_wh_dhgx_merge.key]: () => {
         if (properties.layer == hb_wh_dhgx_merge.children.psfq.key) {
-          const layerSplit = properties.c_layer.split("_");
+          const layerSplit = properties.c_layer.split('_');
           let geometry = Terraformer.WKT.parse(properties.geometry);
 
           busEmit(setHighlight.key, []);
-          const type = _.chunk(layerSplit[1], 2)[0].join("");
-          let pType = type == "雨水" ? "YS" : "WS";
-          pType == "YS" ? ys_flow(properties, true) : ws_flow(properties);
+          const type = _.chunk(layerSplit[1], 2)[0].join('');
+          let pType = type == '雨水' ? 'YS' : 'WS';
+          pType == 'YS' ? ys_flow(properties, true) : ws_flow(properties);
           if (layerSplit[2] != 3) return mapCenterByData(turf.bbox(geometry));
           let features = newfiberMap.map
-            .getSource("hb_wh_dhgx_pipe_line_n_y_w")
-            ._data.features.filter(
-              (i) =>
-                i.properties[type + "系统"] == properties.name &&
-                i.properties["管段类型"] == pType
-            );
+            .getSource('hb_wh_dhgx_pipe_line_n_y_w')
+            ._data.features.filter(i => i.properties[type + '系统'] == properties.name && i.properties['管段类型'] == pType);
           let pFeatures = newfiberMap.map
-            .getSource("point")
-            ._data.features.filter(
-              (i) =>
-                _keys.includes(i.properties.type) &&
-                (i.properties.pointTypeName || "").includes(type)
-            );
-          let p_features = turf.pointsWithinPolygon(
-            turf.featureCollection(pFeatures),
-            geometry
-          );
-          p_features.features.forEach((i) => (i.properties.type = i.properties.type + 1));
+            .getSource('point')
+            ._data.features.filter(i => _keys.includes(i.properties.type) && (i.properties.pointTypeName || '').includes(type));
+          let p_features = turf.pointsWithinPolygon(turf.featureCollection(pFeatures), geometry);
+          p_features.features.forEach(i => (i.properties.type = i.properties.type + 1));
           busEmit(setGeoJSON.key, { json: p_features });
-          console.log("features", p_features, pFeatures);
-          busEmit(
-            setHighlight.key,
-            turf.flatten(turf.featureCollection(features)).features
-          );
+          console.log('features', p_features, pFeatures);
+          busEmit(setHighlight.key, turf.flatten(turf.featureCollection(features)).features);
         }
       },
-    }[layerId] ||
+    })[layerId] ||
     function () {
       //newfiberMap.map.easeTo(newfiberMap.config_.params.init);
     }
-  )());
+  )();
 
   function ys_flow(properties, visible) {
-    const keys = ["雨水系统流向", "雨水系统流向1"];
-    keys.forEach((key) =>
-      busEmit(setLayerVisible.key, { layername: key, isCheck: visible })
-    );
+    const keys = ['雨水系统流向', '雨水系统流向1'];
+    keys.forEach(key => busEmit(setLayerVisible.key, { layername: key, isCheck: visible }));
     setHighlight_(properties);
   }
 
   function ws_flow(properties) {
-    const keys_ = ["雨水", "污水"];
-    const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-    bus.emit("removeMapDatas", keys);
+    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([]));
-    let key = (properties.c_layer || "").includes(keys_[0]) ? keys_[0] : keys_[1];
+    let key = (properties.c_layer || '').includes(keys_[0]) ? keys_[0] : keys_[1];
     if (properties.pointTypeName) key = keys_[1];
-    const nameKey = "龙王咀" || properties.name.substring(0, 2);
-    let features = line.features.filter((i) => i.properties.area.includes(key));
+    const nameKey = '龙王咀' || properties.name.substring(0, 2);
+    let features = line.features.filter(i => i.properties.area.includes(key));
     // let features1 = point.features.filter(i => i.properties.type.includes(key) );
-    let points = _.groupBy(point.features, (a) => a.properties.type);
-    features.forEach((i) => {
+    let points = _.groupBy(point.features, 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) =>
+    /*    Object.keys(points).map((key) =>
       bus.emit("setGeoJSON", {
         json: turf.featureCollection(
           points[key].map((i) => ({
@@ -306,7 +268,7 @@
       })
     );*/
     // bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
-  /*  newfiberMap
+    /*  newfiberMap
       .getLayers()
       .filter((i) => i.newfiberId == keys[3])[0]
       .getSource()
@@ -316,18 +278,16 @@
 };
 
 function setHighlight_(properties = {}) {
-  const temporary = "temporary";
-  bus.emit("removeMapDatas", [temporary]);
+  const temporary = 'temporary';
+  bus.emit('removeMapDatas', [temporary]);
   if (!properties.geometry) return;
   let geojson = turf.polygonToLine(Terraformer.WKT.parse(properties.geometry));
   geojson = geojson.features ? geojson : turf.featureCollection([geojson]);
-  geojson.features.forEach(
-    (i) => (i.properties = { color: "rgba(255,255,0,1)", type: temporary })
-  );
-  bus.emit("setGeoJSON", { json: geojson, key: temporary });
+  geojson.features.forEach(i => (i.properties = { color: 'rgba(255,255,0,1)', type: temporary }));
+  bus.emit('setGeoJSON', { json: geojson, key: temporary });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "村域边界")[0]
+    .filter(i => i.newfiberId == '村域边界')[0]
     .setData(geojson);
 }
 
@@ -335,8 +295,8 @@
   isClockInRange();
   const { setLayerVisible, setHighlight } = events_params;
   Object.keys(events_params)
-    .filter((key) => events_params[key].method)
-    .forEach((key) => busOn(events_params[key].key, events_params[key].method));
+    .filter(key => events_params[key].method)
+    .forEach(key => busOn(events_params[key].key, events_params[key].method));
   // 获取地图项目数据
   dataToMap({});
   //5分钟刷新一次实时数据1000 * 60 * 5)
@@ -345,29 +305,27 @@
   }, 1000 * 60 * 5);*/
   createPopup();
   busEmit(events_params.closeAllLayer.key);
-  proxy.$emit("loadCallback");
+  proxy.$emit('loadCallback');
   ww();
   ysFlow();
 };
 
 const ysFlow = () => {
-  const key = "雨水系统流向";
+  const key = '雨水系统流向';
   // let features = line.features.filter(i => key.includes(i.properties.area));
   // ys_flow.features = ys_flow.features.concat(features).map(i => ({ ...i, properties: { ...i.properties, color: 'rgba(49,254,223,1)', name: undefined } }));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == key)[0]
+    .filter(i => i.newfiberId == key)[0]
     .setData(ys_flow);
   busEmit(events_params.setGeoJSON.key, { json: ys_flow, key: key + 1 });
 };
 
 const ww = () => {
-  const keys = ["尾水路径"];
+  const keys = ['尾水路径'];
   let features = newfiberMap.map
-    .getSource("hb_wh_dhgx_merge")
-    ._data.features.filter(
-      (i) => i.properties.c_layer.includes(keys[0]) && i.properties.geometry_type == 2
-    );
+    .getSource('hb_wh_dhgx_merge')
+    ._data.features.filter(i => i.properties.c_layer.includes(keys[0]) && i.properties.geometry_type == 2);
   busEmit(events_params.setGeoJSON.key, {
     json: turf.featureCollection(features),
     key: keys[0],
@@ -375,33 +333,29 @@
 };
 
 let prevObj = null;
-const panelDataToMap = (obj) => {
+const panelDataToMap = obj => {
   // debugger
   const { setLayerVisible, setHighlight } = events_params;
   // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false });
   busEmit(setHighlight.key, []);
   // busEmit(setLayerVisible.key, { layername: obj.type, isCheck: true });
   // debugger;
-  let features = ["point", "linestring", "polygon", "hb_wh_dhgx_merge"]
-    .map((key) =>
+  let features = ['point', 'linestring', 'polygon', 'hb_wh_dhgx_merge']
+    .map(key =>
       newfiberMap.map
         .getSource(key)
         ._options.data.features.filter(
-          (i) =>
-            (i.properties.name || "").includes(obj.name) &&
-            (obj.id ? obj.id == i.properties.pid : true)
+          i => (i.properties.name || '').includes(obj.name) && (obj.id ? obj.id == i.properties.pid : true)
         )
     )
     .flat();
-  let feature =
-    features.filter((i) => i.properties.name == obj.name)[0] ||
-    features[_.random(0, features.length - 1)];
+  let feature = features.filter(i => i.properties.name == obj.name)[0] || features[_.random(0, features.length - 1)];
   if (!feature) return;
   busEmit(setHighlight.key, [feature]);
   mapCenterByData(turf.bbox(feature));
 };
 
-const mapCenterByData = (bbox) => {
+const mapCenterByData = bbox => {
   newfiberMap.map.fitBounds(
     [
       [bbox[0], bbox[1]],
@@ -410,29 +364,24 @@
     { padding: 50, offset: [100, 10], maxZoom: 18, pitch: 0, duration: 500 }
   );
 };
-const trajectoryToMap = (data) => {
+const trajectoryToMap = data => {
   clearTrajectory();
-  const fields = { lng: "l", lat: "a" };
-  mapCenterByData([data[0]["l"], data[0]["a"], data[1]["l"], data[1]["a"]].map(Number));
-  newfiberMap.map.trackLayer = new mapboxgl1.TrackLayer(
-    newfiberMap.map,
-    data,
-    fields,
-    (properties, index) => {
-      const lng = properties[fields.lng];
-      const lat = properties[fields.lat];
-      if (!(index % 50)) {
-        newfiberMap.map.flyTo({
-          center: [lng, lat],
-          bearing: newfiberMap.map.getBearing(),
-          pitch: newfiberMap.map.getPitch(),
-          zoom: newfiberMap.map.getZoom(),
-        });
-      }
-      /*        setPopupDom('proxy.$refs.trajectory', 1);
-                            newfiberMap.popup.setLngLat([lng,lat]).addTo(newfiberMap.map);*/
+  const fields = { lng: 'l', lat: 'a' };
+  mapCenterByData([data[0]['l'], data[0]['a'], data[1]['l'], data[1]['a']].map(Number));
+  newfiberMap.map.trackLayer = new mapboxgl1.TrackLayer(newfiberMap.map, data, fields, (properties, index) => {
+    const lng = properties[fields.lng];
+    const lat = properties[fields.lat];
+    if (!(index % 50)) {
+      newfiberMap.map.flyTo({
+        center: [lng, lat],
+        bearing: newfiberMap.map.getBearing(),
+        pitch: newfiberMap.map.getPitch(),
+        zoom: newfiberMap.map.getZoom(),
+      });
     }
-  );
+    /*        setPopupDom('proxy.$refs.trajectory', 1);
+                            newfiberMap.popup.setLngLat([lng,lat]).addTo(newfiberMap.map);*/
+  });
 };
 
 const clearTrajectory = () => {
@@ -445,47 +394,47 @@
   const data_default_params = {
     sites: {
       method: getBaseListPoint,
-      fields: { geometry: "geometry", name: "name" },
-      groupMethod: (data) =>
+      fields: { geometry: 'geometry', name: 'name' },
+      groupMethod: data =>
         _.groupBy(
           data
-            .map((i) => i.data)
+            .map(i => i.data)
             .flat()
-            .filter((i) => i.geometry)
-            .map((item) => ({ ...item })),
-          (v) => v.pointType + (v.connectType ? "_" + v.connectType : "")
+            .filter(i => i.geometry)
+            .map(item => ({ ...item })),
+          v => v.pointType + (v.connectType ? '_' + v.connectType : '')
         ),
     },
     //车辆
     cheliang: {
       method: supervisionRealinformationList,
-      fields: { lng: "longitude", lat: "latitude", name: "plateNumber" },
-      groupMethod: (data) =>
+      fields: { lng: 'longitude', lat: 'latitude', name: 'plateNumber' },
+      groupMethod: data =>
         _.groupBy(
           data.supervisionRealinformationList
-            .filter((i) => i.longitude && i.latitude)
-            .map((item) => ({ ...item, type: item.vehicleCategory + item.status })),
-          (v) => v.type
+            .filter(i => i.longitude && i.latitude)
+            .map(item => ({ ...item, type: item.vehicleCategory + item.status })),
+          v => v.type
         ),
     },
   };
   let keys = Object.keys(params || data_default_params);
   const results = await Promise.all(
-    keys.map((k, idx) =>
-      data_default_params[k].method((params || {})[k] || data_default_params[k].mPrams)
-    )
+    keys.map((k, idx) => data_default_params[k].method((params || {})[k] || data_default_params[k].mPrams))
   );
   results.forEach((result, idx) => {
     const data = result.data;
     const k = keys[idx];
     if (!data) return;
-    bus.emit("changeData");
+    const filteredData = filterGeometryNotEmpty(data);
+    appStore.SET_MapData(filteredData);
+    bus.emit('changeData');
     const groups = data_default_params[k].groupMethod(data);
     const g_keys = Object.keys(groups);
-    bus.emit("removeMapDatas", g_keys);
-    g_keys.forEach((key) =>
+    bus.emit('removeMapDatas', g_keys);
+    g_keys.forEach(key =>
       busEmit(beansToMap.key, {
-        beans: groups[key].map((i) => ({
+        beans: groups[key].map(i => ({
           ...i,
           color: (default_params[key] || {}).color,
         })),
@@ -513,16 +462,16 @@
   f();
   nextTick(f);
   function f() {
-    console.log("eval(dom)", eval(dom));
+    console.log('eval(dom)', eval(dom));
     newfiberMap.popup1.setDOMContent(eval(dom));
     newfiberMap.popup1.setOffset(offset);
   }
 };
 
 function filterGeometryNotEmpty(inputData) {
-  return inputData.map((item) => {
+  return inputData.map(item => {
     // 过滤掉每个对象中的 data 数组里 geometry 为空的元素
-    const filteredData = item.data.filter((dataPoint) => dataPoint.geometry !== "");
+    const filteredData = item.data.filter(dataPoint => dataPoint.geometry !== '');
     return {
       ...item,
       data: filteredData,
@@ -531,29 +480,24 @@
 }
 
 //路径规划
-const pathPlanning = async (
-  origin = "116.481028,39.989643",
-  destination = "116.465302,40.004717",
-  callback
-) => {
-  const origin_ = origin.split(",").map(Number);
-  const destination_ = destination.split(",").map(Number);
-  if (origin_.length != 2 || destination_.length != 2)
-    return console.log("输入参数错误：", origin, destination);
+const pathPlanning = async (origin = '116.481028,39.989643', destination = '116.465302,40.004717', callback) => {
+  const origin_ = origin.split(',').map(Number);
+  const destination_ = destination.split(',').map(Number);
+  if (origin_.length != 2 || destination_.length != 2) return console.log('输入参数错误：', origin, destination);
   const results = await request(
     `/amap/v3/direction/driving?origin=${origin}&destination=${destination}&extensions=all&output=json&key=74f1b47f7fea1971354edb2dfacb3982`
   );
-  if (!results.route.paths[0]) return console.log("暂无路径！");
+  if (!results.route.paths[0]) return console.log('暂无路径！');
   callback &&
     callback(
       turf.featureCollection(
-        results.route.paths[0].steps.map((i) =>
+        results.route.paths[0].steps.map(i =>
           turf.feature(
             Terraformer.WKT.parse(
               `LINESTRING(${i.polyline
-                .split(";")
-                .map((i) => i.split(",").join(" "))
-                .join(",")})`
+                .split(';')
+                .map(i => i.split(',').join(' '))
+                .join(',')})`
             ),
             i
           )
@@ -564,19 +508,19 @@
 
 //判断是否在打卡点内
 const isClockInRange = (
-  currentLocation = "POINT(109.41360117253636 34.49038724464877)",
+  currentLocation = 'POINT(109.41360117253636 34.49038724464877)',
   ranges = [
-    "POINT(109.43167853335872 34.51345940211415)",
-    "POINT(109.46797592891363 34.51145239795833)",
-    "POINT(109.44903576574815 34.50165755773118)",
+    'POINT(109.43167853335872 34.51345940211415)',
+    'POINT(109.46797592891363 34.51145239795833)',
+    'POINT(109.44903576574815 34.50165755773118)',
   ],
   rVal = 500
 ) => {
   const feature = { ...Terraformer.WKT.parse(currentLocation) };
   return (
     ranges
-      .map((i) => turf.buffer({ ...Terraformer.WKT.parse(i) }, rVal / 1000))
-      .map((i) => turf.booleanContains(i, feature))
+      .map(i => turf.buffer({ ...Terraformer.WKT.parse(i) }, rVal / 1000))
+      .map(i => turf.booleanContains(i, feature))
       .filter(Boolean)[0] || false
   );
 };
@@ -584,42 +528,40 @@
 const clearTemporaryData = () => {
   const { setLayerVisible, removeMapDatas } = events_params;
   const keys_ = [
-    "问题管线",
-    "1_泵站",
-    "1_污水处理厂",
-    "1_调蓄池",
-    "分区流向",
-    "分区流向1",
-    "rainwater_pipeline_water_level",
-    "rainwater_pipeline_water_level_GWGSWYX",
-    "outlet_info1",
-    "temporary",
-    "highlight_linestring",
-    "highlight_polygon",
-    "highlight_point",
+    '问题管线',
+    '1_泵站',
+    '1_污水处理厂',
+    '1_调蓄池',
+    '分区流向',
+    '分区流向1',
+    'rainwater_pipeline_water_level',
+    'rainwater_pipeline_water_level_GWGSWYX',
+    'outlet_info1',
+    'temporary',
+    'highlight_linestring',
+    'highlight_polygon',
+    'highlight_point',
   ];
-  const hideKeys = ["雨水系统流向", "雨水系统流向1"];
+  const hideKeys = ['雨水系统流向', '雨水系统流向1'];
   bus.emit(removeMapDatas.key, keys_);
-  const keys = newfiberMap.config_.l7.filter((i) => i.temporary).map((i) => i.key);
+  const keys = newfiberMap.config_.l7.filter(i => i.temporary).map(i => i.key);
   newfiberMap
     .getLayers()
-    .filter((i) => keys.includes(i.newfiberId))
-    .forEach((i) => i.setData({ type: "FeatureCollection", features: [] }));
-  hideKeys.forEach((i) => busEmit(setLayerVisible.key, { layername: i, isCheck: false }));
+    .filter(i => keys.includes(i.newfiberId))
+    .forEach(i => i.setData({ type: 'FeatureCollection', features: [] }));
+  hideKeys.forEach(i => busEmit(setLayerVisible.key, { layername: i, isCheck: false }));
 
   setHighlight_();
 };
 
 const remove3Dtiles = () => {
-  newfiberMap.map._controls
-    .filter((i) => i._deck)
-    .forEach((i) => i.setProps({ layers: [] }));
+  newfiberMap.map._controls.filter(i => i._deck).forEach(i => i.setProps({ layers: [] }));
 };
 
 const load3DTiles = ({ id, url }) => {
   remove3Dtiles();
   let deckOverlay = null;
-  deckOverlay = newfiberMap.map._controls.filter((i) => i._deck)[0];
+  deckOverlay = newfiberMap.map._controls.filter(i => i._deck)[0];
   if (!deckOverlay) {
     deckOverlay = new MapboxOverlay({
       interleaved: true,
@@ -639,15 +581,15 @@
         extruded: true, // 设置3D功能
         opacity: 1, // 设置透明度
         loadOptions: {
-          "3d-tiles": {
+          '3d-tiles': {
             loadGLTF: true,
             decodeQuantizedPositions: false,
-            isTileset: "auto",
+            isTileset: 'auto',
             assetGltfUpAxis: null,
           },
         },
         pickable: true, // 设置可选取
-        onTilesetLoad: (tileset) => {
+        onTilesetLoad: tileset => {
           const { cartographicCenter, zoom } = tileset;
           deckOverlay.setProps({
             initialViewState: {
@@ -667,29 +609,27 @@
 
 const busOn = (event, func) => bus.on(event, func);
 
-const busOff = (event) => bus.off(event);
+const busOff = event => bus.off(event);
 //添加临时动态线
 const addDynamicLine = (c_layer, c_layer1) => {
-  if (newfiberMap.getLayerByName("dynamicLine")) {
-    newfiberMap.removeLayer(newfiberMap.getLayerByName("dynamicLine"));
+  if (newfiberMap.getLayerByName('dynamicLine')) {
+    newfiberMap.removeLayer(newfiberMap.getLayerByName('dynamicLine'));
   }
   let dynamicLineJson = turf.featureCollection(
     newfiberMap.map
-      .getSource("sx_wn_hm_merge")
+      .getSource('sx_wn_hm_merge')
       ._data.features.filter(
-        (feature) =>
-          feature.properties.c_layer.includes(c_layer) &&
-          feature.properties.c_layer.includes(c_layer1)
+        feature => feature.properties.c_layer.includes(c_layer) && feature.properties.c_layer.includes(c_layer1)
       )
   );
   console.log(c_layer, dynamicLineJson);
   let layer = new mapboxL7.LineLayer({
-    name: "dynamicLine",
+    name: 'dynamicLine',
   })
     .source(dynamicLineJson)
     .size(3)
-    .shape("line")
-    .color("color")
+    .shape('line')
+    .color('color')
     .animate({
       interval: 1,
       duration: 2,
@@ -698,28 +638,28 @@
   newfiberMap.addLayer(layer);
 };
 const events_params = {
-  removeMapDatas: { key: "removeMapDatas" },
-  setGeoJSON: { key: "setGeoJSON" },
-  setLayerVisible: { key: "setLayerVisible" },
-  beansToMap: { key: "beansToMap" },
-  closeAllLayer: { key: "closeAllLayer" },
-  setHighlight: { key: "setHighlight" },
-  dataToMap: { key: "dataToMap", method: dataToMap },
-  pathPlanning: { key: "pathPlanning", method: pathPlanning },
-  panelDataToMap: { key: "panelDataToMap", method: panelDataToMap },
-  trajectoryToMap: { key: "trajectoryToMap", method: trajectoryToMap },
-  clearTrajectory: { key: "clearTrajectory", method: clearTrajectory },
-  clearTemporaryData: { key: "clearTemporaryData", method: clearTemporaryData },
-  load3DTiles: { key: "load3DTiles", method: load3DTiles },
-  remove3Dtiles: { key: "remove3Dtiles", method: remove3Dtiles },
+  removeMapDatas: { key: 'removeMapDatas' },
+  setGeoJSON: { key: 'setGeoJSON' },
+  setLayerVisible: { key: 'setLayerVisible' },
+  beansToMap: { key: 'beansToMap' },
+  closeAllLayer: { key: 'closeAllLayer' },
+  setHighlight: { key: 'setHighlight' },
+  dataToMap: { key: 'dataToMap', method: dataToMap },
+  pathPlanning: { key: 'pathPlanning', method: pathPlanning },
+  panelDataToMap: { key: 'panelDataToMap', method: panelDataToMap },
+  trajectoryToMap: { key: 'trajectoryToMap', method: trajectoryToMap },
+  clearTrajectory: { key: 'clearTrajectory', method: clearTrajectory },
+  clearTemporaryData: { key: 'clearTemporaryData', method: clearTemporaryData },
+  load3DTiles: { key: 'load3DTiles', method: load3DTiles },
+  remove3Dtiles: { key: 'remove3Dtiles', method: remove3Dtiles },
   isOpenPanorama: {
-    key: "isOpenPanorama",
-    method: (flag) => (datas.isOpenPanorama = flag),
+    key: 'isOpenPanorama',
+    method: flag => (datas.isOpenPanorama = flag),
   },
 };
 
 onMounted(() => {
-  bus.on("YQ_head", (val) => {
+  bus.on('YQ_head', val => {
     if (val == false) {
       MapShow.value = false;
     } else {
@@ -729,10 +669,10 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("YQ_head");
+  bus.off('YQ_head');
   Object.keys(events_params)
-    .filter((key) => events_params[key].method)
-    .forEach((key) => busOff(events_params[key].key));
+    .filter(key => events_params[key].method)
+    .forEach(key => busOff(events_params[key].key));
   clearInterval(refreshTimer.value); // 清除定时器
   refreshTimer.value = null;
 });
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 103504c..6befe29 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -10,8 +10,12 @@
     roles: [],
     userInfo: {},
     permissions: [],
+    MapData: [],
   }),
   actions: {
+    SET_MapData(MapData) {
+      this.MapData = MapData;
+    },
     // 登录
     login(userInfo) {
       const username = userInfo.username.trim();
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index e6eb365..d7dd72b 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -6,6 +6,7 @@
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
+      <inputSearch></inputSearch>
     </div>
 
     <el-dialog
@@ -48,6 +49,7 @@
 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';
 
 const useStore = usepartitionStore();
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
new file mode 100644
index 0000000..282aa28
--- /dev/null
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="inputSearch" v-show="Show && number == 4">
+    <el-select
+      v-model="selectmodel"
+      placeholder="输入关键字搜索"
+      style="width: 180px"
+      filterable
+      :filter-method="filterMethod"
+      clearable
+      @change="selectchange"
+    >
+      <el-option v-for="(item, index) in filterList" :key="item.id + index + item.id" :label="item.name" :value="item.geometry">
+        <el-popover v-if="item.name.length >= 15" placement="top-start" width="300" trigger="hover" popper-class="popperclass">
+          <span>{{ item.name }}</span>
+          <template #reference>
+            {{ item.name.slice(0, 15) + '...' }}
+          </template>
+        </el-popover>
+        <span v-else>{{ item.name }}</span>
+        <span style="float: right; color: var(--el-text-color-secondary); font-size: 13px">
+          {{ item.pointTypeName }}
+        </span>
+      </el-option>
+    </el-select>
+  </div>
+</template>
+<script setup>
+import bus from '@/bus/';
+import useUserStore from '@/store/modules/user';
+const appStore = useUserStore();
+const { proxy } = getCurrentInstance();
+const Show = ref(true);
+
+const props = defineProps({
+  diabox: {
+    type: Object,
+  },
+});
+
+const number = ref(1);
+const SelectList = ref(1);
+const filterList = ref([]);
+const selectmodel = ref('');
+const getItem = ref({});
+watch(
+  () => appStore.MapData,
+  (newValue, oldValue) => {
+    if (appStore.MapData && appStore.MapData.length) {
+      if (number.value === 1) {
+        GetSearchList();
+        number.value = 4;
+      }
+    }
+    // 示例调用
+  },
+  { deep: true, once: true }
+);
+
+function GetSearchList() {
+  SelectList.value = [];
+  appStore.MapData.map(item => {
+    SelectList.value = SelectList.value.concat(item.data);
+  });
+  console.log('MapData', appStore.MapData, SelectList.value);
+  filterList.value = JSON.parse(JSON.stringify(SelectList.value));
+}
+
+// 值改变后的操作
+function selectchange(value) {
+  if (value) {
+    // 选中的操作
+    let arr = SelectList.value.filter(item => {
+      return item.geometry == value;
+    });
+    if (arr && arr[0]) {
+      getItem.value = arr[0];
+    }
+    console.log('选中change', getItem.value);
+  } else {
+    // 清除的操作
+    console.log('清除change', getItem.value);
+  }
+}
+
+function filterMethod(value) {
+  console.log('filterMethod', value);
+  if (value) {
+    filterList.value = SelectList.value.filter(item => item.name.includes(value));
+  } else {
+    filterList.value = SelectList.value;
+  }
+}
+
+onMounted(() => {
+  bus.on('YQ_head', val => {
+    if (val == false) {
+      Show.value = false;
+    } else {
+      Show.value = true;
+    }
+  });
+});
+
+onBeforeUnmount(() => {
+  bus.off('YQ_head');
+});
+</script>
+<style lang="scss" scoped>
+.inputSearch {
+  position: fixed;
+  right: 155px;
+  top: 19px;
+  z-index: 999;
+}
+
+:deep(.el-input__wrapper) {
+  background: #032d79 !important;
+}
+
+:deep(.el-input__inner) {
+  color: #fff;
+}
+
+.popperclass {
+  z-index: 10000 !important;
+}
+</style>
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue
index 9887c89..1fd5494 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue
@@ -2,83 +2,81 @@
   <!-- 监测分析 -->
   <div id="jiancefenxiZSFX">
     <div class="dateDatetimerange">
-    <el-date-picker
-      v-model="Timers"
-      type="datetimerange"
-      range-separator="至"
-      :clearable="false"
-      value-format="YYYY-MM-DD HH:mm:ss"
-      start-placeholder="开始时间"
-      end-placeholder="结束时间"
-      @change="datetimerangeChange"
-    />
+      <el-date-picker
+        v-model="Timers"
+        type="datetimerange"
+        range-separator="至"
+        :clearable="false"
+        value-format="YYYY-MM-DD HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="datetimerangeChange"
+      />
     </div>
-    <div class="ChartHeight"  v-loading="loadingEchart"
-    element-loading-background="rgba(11, 18, 52, 0.3)" >
-                                  <shuikujianceEcharts v-if="showecharts"
-          :refresh="chartInfo2.refresh"
-          :DataName="chartInfo2.DataName"
-          :XAxis="chartInfo2.XAxis"
-          :YAxis="chartInfo2.YAxis"
-          :typeName="chartInfo2.typeName"
-          :typeName2="chartInfo2.typeName2"
-          :YAxis2="chartInfo2.YAxis2"
-          :YAxis3="chartInfo2.YAxis3"
-          :yAxisarr="chartInfo2.yAxisarr"
-        >
-        </shuikujianceEcharts>
+    <div class="ChartHeight" v-loading="loadingEchart" element-loading-background="rgba(11, 18, 52, 0.3)">
+      <shuikujianceEcharts
+        v-if="showecharts"
+        :refresh="chartInfo2.refresh"
+        :DataName="chartInfo2.DataName"
+        :XAxis="chartInfo2.XAxis"
+        :YAxis="chartInfo2.YAxis"
+        :typeName="chartInfo2.typeName"
+        :typeName2="chartInfo2.typeName2"
+        :YAxis2="chartInfo2.YAxis2"
+        :YAxis3="chartInfo2.YAxis3"
+        :yAxisarr="chartInfo2.yAxisarr"
+      >
+      </shuikujianceEcharts>
     </div>
-        <div class="flex flex-justcontent-spacebetween">
+    <div class="flex flex-justcontent-spacebetween">
       <div class="eachInfo">
-      <div class="name">所属雨水分区:</div>
-      <div class="text">{{listData.rainArea}}</div>
-    </div>
-    <div class="eachInfo">
-      <div class="name">运维片区:</div>
-      <div class="text">{{listData.watchAreaName}}</div>
-    </div>
-    </div>
-
-     <div class="tableBox">
-      <div class="name">历史经验:</div>
-      <div class="text popUpTable">
-        <el-table :data="listData.rainHistoryList" class=" w100" stripe>
-            <el-table-column prop="time" label="降雨日期">
-              <!-- <template #default="scope">
-                  {{ moment(scope.row.time).format("YYYY年MM月DD日") }}
-              </template> -->
-            </el-table-column>
-            <el-table-column prop="rain" label="日降雨量(mm)"  />
-            <el-table-column prop="jyjb" label="降雨级别" width="90px" >
-            <template #default="scope">
-                <div>
-                  {{ RainfallLevelFun(scope.row.rain )}}
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column prop="zdjss" label="最大积水深(cm)"  />
-            <el-table-column prop="nlqx" label="内涝情形"  />
-            <el-table-column prop="duration" label="内涝持续时间(分钟)" width="160px" />
-            <!-- <el-table-column prop="responseEndTime" label="备注" width="120" :show-overflow-tooltip="true" /> -->
-          </el-table>
+        <div class="name">所属雨水分区:</div>
+        <div class="text">{{ listData.rainArea }}</div>
+      </div>
+      <div class="eachInfo">
+        <div class="name">运维片区:</div>
+        <div class="text">{{ listData.watchAreaName }}</div>
       </div>
     </div>
-     <div class="eachInfo">
+
+    <div class="tableBox">
+      <div class="name">历史经验:</div>
+      <div class="text popUpTable">
+        <el-table :data="listData.rainHistoryList" class="w100" stripe>
+          <el-table-column prop="time" label="降雨日期">
+            <!-- <template #default="scope">
+                  {{ moment(scope.row.time).format("YYYY年MM月DD日") }}
+              </template> -->
+          </el-table-column>
+          <el-table-column prop="rain" label="日降雨量(mm)" />
+          <el-table-column prop="jyjb" label="降雨级别" width="90px">
+            <template #default="scope">
+              <div>
+                {{ RainfallLevelFun(scope.row.rain) }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="zdjss" label="最大积水深(cm)" />
+          <el-table-column prop="nlqx" label="内涝情形" />
+          <el-table-column prop="duration" label="内涝持续时间(分钟)" width="160px" />
+          <!-- <el-table-column prop="responseEndTime" label="备注" width="120" :show-overflow-tooltip="true" /> -->
+        </el-table>
+      </div>
+    </div>
+    <div class="eachInfo">
       <div class="name">周边环境分析:</div>
-      <div class="text">{{listData.zbhjfx}}</div>
+      <div class="text">{{ listData.zbhjfx }}</div>
     </div>
 
-     <div class="eachInfo">
+    <div class="eachInfo">
       <div class="name">分析建议:</div>
-      <div class="text">{{listData.fxjy}}</div>
+      <div class="text">{{ listData.fxjy }}</div>
     </div>
-
-    
   </div>
 </template>
 
 <script setup name="jiancefenxiZSFX">
-import { drainageDispatchRainAnalysisByZsjcd,getEchart } from '@/api/MonitorAssetsOnMap';
+import { drainageDispatchRainAnalysisByZsjcd, getEchart } from '@/api/MonitorAssetsOnMap';
 import { Back } from '@element-plus/icons-vue';
 
 import shuikujianceEcharts from '@/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue';
@@ -100,73 +98,71 @@
   arrid: {
     type: Array,
   },
-  Getproperties:{
+  Getproperties: {
     type: Object,
-  }
+  },
 });
 
-const Timers = ref([
-  moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"),
-    moment().format("YYYY-MM-DD HH:mm:ss"),
-])
+const Timers = ref([moment().subtract(3, 'day').format('YYYY-MM-DD HH:mm:ss'), moment().format('YYYY-MM-DD HH:mm:ss')]);
 
-const datetimerangeChange=()=>{
-  getDataEchart()
-}
+const datetimerangeChange = () => {
+  getDataEchart();
+};
 // 获取数据
-const loading=ref(false)
-const listData=ref({
-
-})
-
+const loading = ref(false);
+const listData = ref({});
 
 function gitDataFun() {
-  loading.value=true
-  let params={
-    id:props.Getproperties.id
-  }
-  drainageDispatchRainAnalysisByZsjcd(params).then(res => {
-    console.log('监测分析渍水风险降雨历史', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
+  loading.value = true;
+  let params = {
+    id: props.Getproperties.id,
+  };
+  drainageDispatchRainAnalysisByZsjcd(params).then(
+    res => {
+      console.log('监测分析渍水风险降雨历史', res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+      }
+    },
+    error => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
 
-const changeTime=(e)=>{
-console.log('e',e);
+const changeTime = e => {
+  console.log('e', e);
+};
+function RainfallLevelFun(rain) {
+  let sum = Number(rain);
+  let text = '';
+  switch (true) {
+    // 江河水位
+    case sum > 200:
+      text = '特大暴雨';
+      break;
+    case sum > 100:
+      text = '大暴雨';
+      break;
+    case sum > 50:
+      text = '暴雨';
+      break;
+    case sum > 25:
+      text = '大雨';
+      break;
+    case sum > 10:
+      text = '中雨';
+      break;
+    case sum > 0:
+      text = '小雨';
+      break;
+    default:
+      text = '无雨';
+  }
+  return text;
 }
-function RainfallLevelFun(rain){
-  let sum=Number(rain);
-  let text='';
-        switch (true) {
-        // 江河水位
-        case sum>200:
-          text= '特大暴雨'
-          break;
-          case sum>100:
-          text= '大暴雨'
-          break;
-          case sum>50:
-          text= '暴雨'
-          break;
-           case sum>25:
-          text= '大雨'
-          break;
-          case sum>10:
-          text= '中雨'
-          break;
-          case sum>0:
-          text= '小雨'
-          break;
-          default:
-            text= '无雨'
-        }
-          return text
-}
+
 const chartInfo2 = ref({
   refresh: 1,
   DataName: '',
@@ -174,63 +170,57 @@
   typeName: '降雨量',
   YAxis: [0, 1, 6, 3, 4],
   loading: false,
-  yAxisarr: [
-
-  ],
-  marklinearr: [
-
-  ],
+  yAxisarr: [],
+  marklinearr: [],
 });
-  
-      let loadingEchart=ref(false)
-      const showecharts = ref(false);
-function getDataEchart(){
- showecharts.value = false;
- loadingEchart.value=true
-    let params={
 
-      stType:props.Getproperties.stType,
-      stCode:props.Getproperties.stCode,  
-      // start:'2024-09-01 12:12:12',
-      // end:'2024-12-01 12:12:12',
-      //       dataCode:'reservoir_info',
-      // stType:'reservoir_water_level',
-      // stCode:'4201110002',  
-      start:Timers.value[0],
-      end:Timers.value[1],
+let loadingEchart = ref(false);
+const showecharts = ref(false);
+function getDataEchart() {
+  showecharts.value = false;
+  loadingEchart.value = true;
+  let params = {
+    stType: props.Getproperties.stType,
+    stCode: props.Getproperties.stCode,
+    // start:'2024-09-01 12:12:12',
+    // end:'2024-12-01 12:12:12',
+    //       dataCode:'reservoir_info',
+    // stType:'reservoir_water_level',
+    // stCode:'4201110002',
+    start: Timers.value[0],
+    end: Timers.value[1],
+  };
+  console.log('params', params);
+
+  getEchart(params).then(
+    res => {
+      showecharts.value = true;
+      loadingEchart.value = false;
+
+      console.log(res.data);
+      chartInfo2.value.XAxis = res.data.times;
+      chartInfo2.value.yAxisarr = res.data.datas;
+
+      res.data.datas.map(item => {
+        chartInfo2.value.marklinearr.push(...item.cordonLineList);
+      });
+
+      console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
+
+      chartInfo2.value.refresh = Math.random();
+    },
+    error => {
+      loadingEchart.value = false;
     }
-    console.log('params',params);
-    
-  getEchart(params).then(res => {
-    showecharts.value = true;
- loadingEchart.value=false
-
-    console.log(res.data);
-    chartInfo2.value.XAxis = res.data.times;
-    chartInfo2.value.yAxisarr = res.data.datas;
-
-    res.data.datas.map(item => {
-      chartInfo2.value.marklinearr.push(...item.cordonLineList);
-    });
-
-    console.log('chartInfo2.value.marklinearr', chartInfo2.value.marklinearr);
-
-    chartInfo2.value.refresh = Math.random();
-  },(error)=>{
-    loadingEchart.value=false
-  });
-
+  );
 }
 onMounted(() => {
-
-  console.log('Getproperties123',props.Getproperties);
-  if(props.Getproperties.daterange){
-    Timers.value=props.Getproperties.daterange
+  console.log('Getproperties123', props.Getproperties);
+  if (props.Getproperties.daterange) {
+    Timers.value = props.Getproperties.daterange;
   }
-  getDataEchart()
-  gitDataFun()
-
-
+  getDataEchart();
+  gitDataFun();
 });
 </script>
 
@@ -251,7 +241,7 @@
     font-weight: bold;
     font-size: 14px;
     margin-bottom: 10px;
-    
+
     .name {
       color: #ccdfff;
       width: 100px;
@@ -259,7 +249,7 @@
       padding-right: 10px;
     }
     .text {
-        flex: 1;
+      flex: 1;
       min-height: 37px;
       min-width: 200px;
       color: #8fbffe;
@@ -283,7 +273,7 @@
     .text {
       width: calc(100% - 100px);
     }
-        :deep(.el-scrollbar__wrap) {
+    :deep(.el-scrollbar__wrap) {
       max-height: 140px;
       overflow-y: auto;
     }
@@ -292,13 +282,13 @@
     margin-bottom: 10px;
     :deep(.el-range-editor.el-input__wrapper) {
       background: #0d2359;
-      
-      box-shadow:none;
+
+      box-shadow: none;
       .el-range-separator {
         color: #fff;
       }
-       .el-range-input {
-color: #fff;
+      .el-range-input {
+        color: #fff;
       }
     }
   }