diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 52989b9..33def0e 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>
 
   <PopupInfo>
     {{ item?.aaa }}
@@ -17,34 +11,34 @@
 </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_flow1 from "../../../public/static/libs/mapbox/json/ys_flow_2.json";
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
+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_flow1 from '../../../public/static/libs/mapbox/json/ys_flow_2.json';
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
 
-import outlet_route from "../../../public/static/libs/mapbox/json/outlet_route.json";
-import outlet_site from "../../../public/static/libs/mapbox/json/outlet_site.json";
+import outlet_route from '../../../public/static/libs/mapbox/json/outlet_route.json';
+import outlet_site from '../../../public/static/libs/mapbox/json/outlet_site.json';
 
-import PopupInfo from "@/components/Map/popup.vue";
-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 PopupInfo from '@/components/Map/popup.vue';
+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,
@@ -59,92 +53,92 @@
 const refreshTimer = ref(null);
 const default_params = {
   point: {
-    key: "point",
+    key: 'point',
     prevId: null,
     children: {
       outlet_info2: {
-        key: "outlet_info2",
+        key: 'outlet_info2',
       },
     },
   },
   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,
   },
   psfq: {
-    key: "排水分区",
-    text_key: "排水分区_text",
+    key: '排水分区',
+    text_key: '排水分区_text',
     prevIds: [],
     children: {
-      WS: { key: "污水分区" },
-      YS: { key: "雨水分区" },
+      WS: { key: '污水分区' },
+      YS: { key: '雨水分区' },
     },
   },
   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;
     })();
   const _keys = [
-    "rain_water_pump_station_info1",
-    "sewage_pump_station_info1",
-    "rainwater_pipeline_quality_area1",
-    "clickPoint",
-    "temporary",
+    'rain_water_pump_station_info1',
+    'sewage_pump_station_info1',
+    'rainwater_pipeline_quality_area1',
+    'clickPoint',
+    'temporary',
   ];
 
-  console.log("properties", properties, layerId);
+  console.log('properties', properties, layerId);
   // 图层点击事件
   if (properties) {
     if (properties.type == _keys[4]) properties.type = properties.pointType;
-    bus.emit("FenQuClick", { properties, layerId: layerId.split("_")[0] });
+    bus.emit('FenQuClick', { properties, layerId: layerId.split('_')[0] });
   }
   clearTrajectory();
   // clearTemporaryData();
-  proxy.$emit("map-click1", lngLat, properties, layerId);
+  proxy.$emit('map-click1', lngLat, properties, layerId);
   const { town, hupo, gangqu, hb_wh_dhgx_merge, psfq, point } = default_params;
   const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
 
@@ -153,11 +147,11 @@
     ysFlow();
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == "村域边界")[0]
+      .filter(i => i.newfiberId == '村域边界')[0]
       .setData(turf.featureCollection([]));
     busEmit(
       removeMapDatas.key,
-      _keys.filter((i) => i != (properties || {}).type)
+      _keys.filter(i => i != (properties || {}).type)
     );
 
     if (town.prevId) {
@@ -177,43 +171,31 @@
         showOutletInfo(properties);
       }*/
   })();
-  ((
-    {
+  (
+    ({
       [point.key]: () => {
         const { outlet_info2 } = point.children;
-        ((
-          {
-            [outlet_info2.key]: (properties) => {
+        (
+          ({
+            [outlet_info2.key]: properties => {
               clearRouteMethod();
               outletRouteMethod(properties);
             },
-          }[properties.type] || function () {}
-        )(properties));
+          })[properties.type] || function () {}
+        )(properties);
       },
       [psfq.key]: () => {
-        ["雨水系统流向", "雨水系统流向1"].forEach((k) =>
-          busEmit(setLayerVisible.key, { layername: k, isCheck: false })
+        ['雨水系统流向', '雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, { layername: k, isCheck: false }));
+        ['outlet_info2', '排口流向', '排口流向1', 'rainwater_pipeline_quality1', _keys[2]].forEach(k =>
+          busEmit(setLayerVisible.key, { layername: k, isCheck: true })
         );
-        [
-          "outlet_info2",
-          "排口流向",
-          "排口流向1",
-          "rainwater_pipeline_quality1",
-          _keys[2],
-        ].forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
         areaToMap(properties);
       },
       [psfq.text_key]: () => {
-        ["雨水系统流向", "雨水系统流向1"].forEach((k) =>
-          busEmit(setLayerVisible.key, { layername: k, isCheck: false })
+        ['雨水系统流向', '雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, { layername: k, isCheck: false }));
+        ['outlet_info2', '排口流向', '排口流向1', 'rainwater_pipeline_quality1', _keys[2]].forEach(k =>
+          busEmit(setLayerVisible.key, { layername: k, isCheck: true })
         );
-        [
-          "outlet_info2",
-          "排口流向",
-          "排口流向1",
-          "rainwater_pipeline_quality1",
-          _keys[2],
-        ].forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
         areaToMap({
           ...properties,
           geometry: Terraformer.WKT.convert(JSON.parse(properties.geometrys)),
@@ -222,12 +204,10 @@
       [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 });
@@ -239,38 +219,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,
@@ -281,27 +253,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,
@@ -310,13 +276,13 @@
       },
       [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);
           districtMask(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);
@@ -328,39 +294,30 @@
                            busEmit(setHighlight.key, turf.flatten(turf.featureCollection(features)).features);*/
         }
       },
-    }[layerId] ||
+    })[layerId] ||
     function () {
       //newfiberMap.map.easeTo(newfiberMap.config_.params.init);
     }
-  )());
+  )();
 
   function areaToMap(properties) {
     clearRouteMethod();
-    properties.level == "1" && !layerId
-      ? newfiberMap.map.easeTo(newfiberMap.config_.params.init)
-      : districtMask(properties);
-    properties.level == "2" && showOutletInfo(properties);
-    if (properties.level == "3" && properties.type == "YS") {
-      ys_flow(
-        { ...properties, c_layer: `排水分区_${properties.type}_${properties.level}` },
-        true
-      );
+    properties.level == '1' && !layerId ? newfiberMap.map.easeTo(newfiberMap.config_.params.init) : districtMask(properties);
+    properties.level == '2' && showOutletInfo(properties);
+    if (properties.level == '3' && properties.type == 'YS') {
+      ys_flow({ ...properties, c_layer: `排水分区_${properties.type}_${properties.level}` }, true);
       let ids = newfiberMap.map
-        .getSource(newfiberMap.map.getLayer("排水分区").source)
-        ._data.features.filter(
-          (i) => i.properties.p_type == properties.type + properties.name
-        )
-        .map((i) => i.properties.id);
-      let p_feature = turf.flatten(
-        turf.feature(Terraformer.WKT.parse(properties.geometry))
-      ).features[0];
+        .getSource(newfiberMap.map.getLayer('排水分区').source)
+        ._data.features.filter(i => i.properties.p_type == properties.type + properties.name)
+        .map(i => i.properties.id);
+      let p_feature = turf.flatten(turf.feature(Terraformer.WKT.parse(properties.geometry))).features[0];
 
       let features = newfiberMap.map
-        .getSource("point")
-        ._data.features.filter((i) => _keys[2].includes(i.properties.type))
-        .filter((o) => turf.booleanPointInPolygon(o, p_feature));
+        .getSource('point')
+        ._data.features.filter(i => _keys[2].includes(i.properties.type))
+        .filter(o => turf.booleanPointInPolygon(o, p_feature));
       // .filter(i => ids.includes(Number(i.properties.waterRegionId)));
-      features = features.map((i) =>
+      features = features.map(i =>
         Object.assign(_.cloneDeep(i), {
           properties: { ...i.properties, type: i.properties.type + 1 },
         })
@@ -374,11 +331,7 @@
       layername: psfq.children[properties.type].key,
       isCheck: false,
       values: Array.from(
-        new Set(
-          newfiberMap.map
-            .getSource("hb_wh_dhgx_psfq_geometrys")
-            ._data.features.map((i) => i.properties.p_type)
-        )
+        new Set(newfiberMap.map.getSource('hb_wh_dhgx_psfq_geometrys')._data.features.map(i => i.properties.p_type))
       ),
     });
     busEmit(setLayerVisible.key, {
@@ -386,12 +339,11 @@
       isCheck: true,
       values: [openLayer],
     });
-    if (layerId && psfq.prevIds.filter((i) => i.id == properties.id).length == 0)
-      psfq.prevIds.push(properties);
+    if (layerId && psfq.prevIds.filter(i => i.id == properties.id).length == 0) psfq.prevIds.push(properties);
   }
 
   function showOutletInfo(properties) {
-    const key = "outlet_info";
+    const key = 'outlet_info';
     busEmit(setLayerVisible.key, {
       layername: key + properties.w_id,
       isCheck: Boolean(layerId),
@@ -399,23 +351,19 @@
   }
 
   function outletRouteMethod(properties) {
-    const _keys = ["排口流向", "排口流向1", "rainwater_pipeline_quality1"];
-    _keys.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
+    const _keys = ['排口流向', '排口流向1', 'rainwater_pipeline_quality1'];
+    _keys.forEach(k => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
     let sites = turf.featureCollection(
       outlet_site.features.filter(
-        (i) =>
-          (i.properties.outlet_id || "").split(",").includes(properties.id) &&
-          i.properties.connectType != "area"
+        i => (i.properties.outlet_id || '').split(',').includes(properties.id) && i.properties.connectType != 'area'
       )
     );
     let routes = turf.featureCollection(
-      outlet_route.features.filter((i) =>
-        (i.properties.outlet_id || "").split(",").includes(properties.id)
-      )
+      outlet_route.features.filter(i => (i.properties.outlet_id || '').split(',').includes(properties.id))
     );
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == _keys[1])[0]
+      .filter(i => i.newfiberId == _keys[1])[0]
       .setData(routes);
     busEmit(setGeoJSON.key, { json: routes, key: _keys[0] });
     busEmit(setGeoJSON.key, { json: sites, key: _keys[2] });
@@ -439,57 +387,46 @@
     }
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == "蒙版")[0]
+      .filter(i => i.newfiberId == '蒙版')[0]
       .setData(turf.featureCollection(feature));
   }
 
   function ys_flow(properties, visible) {
-    const keys = ["雨水系统流向", "雨水系统流向1"];
-    if (!visible)
-      return keys.forEach((key) =>
-        busEmit(setLayerVisible.key, { layername: key, isCheck: visible })
-      );
-    const layerSplit = properties.c_layer.split("_");
+    const keys = ['雨水系统流向', '雨水系统流向1'];
+    if (!visible) return keys.forEach(key => busEmit(setLayerVisible.key, { layername: key, isCheck: visible }));
+    const layerSplit = properties.c_layer.split('_');
     const level = layerSplit[2];
     let features = ys_flow1.features.filter(
-      (i) =>
-        i.properties.level_ == level &&
-        (level == "1" || i.properties["area_" + level] == properties.name)
+      i => i.properties.level_ == level && (level == '1' || i.properties['area_' + level] == properties.name)
     );
     const p = properties.name.substr(0, 2);
     let feature =
-      level == "3"
-        ? ys_flow1.features.filter((i) =>
-            (i.properties.bind || "").includes(properties.name)
-          )
-        : ys_flow1.features.filter(
-            (i) => i.properties.level_ < level && i.properties.area_2.includes(p)
-          );
+      level == '3'
+        ? ys_flow1.features.filter(i => (i.properties.bind || '').includes(properties.name))
+        : ys_flow1.features.filter(i => i.properties.level_ < level && i.properties.area_2.includes(p));
     ysFlow(turf.featureCollection(features.concat(feature)));
-    keys.forEach((key) =>
-      busEmit(setLayerVisible.key, { layername: key, isCheck: visible })
-    );
+    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) =>
             bus.emit("setGeoJSON", {
@@ -515,24 +452,22 @@
 
 function clearRouteMethod() {
   const { removeMapDatas } = events_params;
-  const _keys = ["排口流向", "排口流向1", "rainwater_pipeline_quality1"];
+  const _keys = ['排口流向', '排口流向1', 'rainwater_pipeline_quality1'];
   busEmit(removeMapDatas.key, [_keys[2], _keys[0]]);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == _keys[1])[0]
+    .filter(i => i.newfiberId == _keys[1])[0]
     .setData(turf.featureCollection([]));
 }
 
 function setHighlight_(properties = {}) {
-  const temporary = "temporary";
-  bus.emit("removeMapDatas", [temporary]);
-  if (!properties.geometry || properties.geometry.includes("POINT")) return;
+  const temporary = 'temporary';
+  bus.emit('removeMapDatas', [temporary]);
+  if (!properties.geometry || properties.geometry.includes('POINT')) 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]
@@ -542,49 +477,45 @@
 const getModalData = () => {
   isClockInRange();
   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({});
   createPopup();
   busEmit(events_params.closeAllLayer.key);
-  proxy.$emit("loadCallback");
+  proxy.$emit('loadCallback');
   ww();
   ysFlow();
 
   newfiberMap.contextMenu = new mapboxgl1.ContextMenu({
     items: [
       {
-        text: "街景",
+        text: '街景',
         callback: async (point1, feature, layerId) => {
-          console.log("周边街景经纬度1", point1);
+          console.log('周边街景经纬度1', point1);
           let point = _.cloneDeep(point1);
           let clickPoint = turf.point(Object.values(point));
-          let positionAddress = "";
+          let positionAddress = '';
           gcoord.transform(clickPoint, gcoord.WGS84, gcoord.BD09);
           let data = await request(
-            `/bdApi//baiduservice/panorama?fov=180&height=256&width=512&location=${turf
-              .getCoords(clickPoint)
-              .join(",")}`
+            `/bdApi//baiduservice/panorama?fov=180&height=256&width=512&location=${turf.getCoords(clickPoint).join(',')}`
           );
-          data.data.base64 =
-            data && data.data && "data:image/jpeg;base64," + data.data.base64;
+          data.data.base64 = data && data.data && 'data:image/jpeg;base64,' + data.data.base64;
           gcoord.transform(clickPoint, gcoord.BD09, gcoord.GCJ02);
           const regeodata = await geoRegeo({ lngLat: turf.getCoords(clickPoint) });
-          positionAddress =
-            regeodata.info === "OK" && regeodata.regeocode.formatted_address;
+          positionAddress = regeodata.info === 'OK' && regeodata.regeocode.formatted_address;
           gcoord.transform(clickPoint, gcoord.GCJ02, gcoord.WGS84);
           busEmit(events_params.setGeoJSON.key, {
             json: turf.featureCollection([clickPoint]),
-            key: "clickPoint",
+            key: 'clickPoint',
           });
-          data.stName = positionAddress;
-          bus.emit("popupcontent", {
+          data.roadName = positionAddress;
+          bus.emit('popupcontent', {
             popupShow: true,
             point: turf.getCoords(clickPoint),
             popupInfo: data,
           });
-          console.log("周边街景经纬度2", turf.getCoords(clickPoint));
+          console.log('周边街景经纬度2', turf.getCoords(clickPoint));
         },
       },
     ],
@@ -592,38 +523,34 @@
   newfiberMap.contextMenu.addTo(newfiberMap.map);
 };
 
-const ysFlow = (geojson) => {
-  const key = "雨水系统流向";
-  const widths = ["", 10, 5, 1];
+const ysFlow = geojson => {
+  const key = '雨水系统流向';
+  const widths = ['', 10, 5, 1];
   if (!geojson) {
-    ys_flow1.features = ys_flow1.features.map((i) => ({
+    ys_flow1.features = ys_flow1.features.map(i => ({
       ...i,
       properties: {
         ...i.properties,
-        color: "rgba(10,170,249,1)",
+        color: 'rgba(10,170,249,1)',
         width: widths[i.properties.level_],
         name: undefined,
       },
     }));
-    geojson = turf.featureCollection(
-      ys_flow1.features.filter((i) => i.properties.level_ == 1)
-    );
+    geojson = turf.featureCollection(ys_flow1.features.filter(i => i.properties.level_ == 1));
   }
-  bus.emit("removeMapDatas", [key + "1"]);
+  bus.emit('removeMapDatas', [key + '1']);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == key)[0]
+    .filter(i => i.newfiberId == key)[0]
     .setData(geojson);
   busEmit(events_params.setGeoJSON.key, { json: geojson, 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],
@@ -631,44 +558,35 @@
 };
 
 let prevObj = null;
-const panelDataToMap = (obj) => {
-  let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件  默认触发
+const panelDataToMap = obj => {
+  let isUp = Object.keys(obj).includes('isUp') ? obj.isUp : true; //是否触发地图点击事件  默认触发
   // 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_psfq_geometrys",
-    "hb_wh_dhgx_merge",
-  ]
-    .map((key) =>
+  let features = ['point', 'linestring', 'polygon', 'hb_wh_dhgx_psfq_geometrys', '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.p_type)[0] ||
-    features.filter((i) => i.properties.name == obj.name)[0] ||
+    features.filter(i => i.properties.p_type)[0] ||
+    features.filter(i => i.properties.name == obj.name)[0] ||
     features[_.random(0, features.length - 1)];
-  console.log("feature.properties.p_type&&isUp", feature.properties.p_type && isUp);
-  if (feature.properties.p_type && isUp)
-    return mapClickEvt(undefined, feature.properties, "排水分区");
+  console.log('feature.properties.p_type&&isUp', feature.properties.p_type && isUp);
+  if (feature.properties.p_type && isUp) return mapClickEvt(undefined, feature.properties, '排水分区');
   if (!feature) return;
   busEmit(setHighlight.key, [feature]);
   mapCenterByData(turf.bbox(feature));
 };
 
-const mapCenterByData = (bbox) => {
+const mapCenterByData = bbox => {
   newfiberMap.map.fitBounds(
     [
       [bbox[0], bbox[1]],
@@ -677,29 +595,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 = () => {
@@ -712,55 +625,53 @@
   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 : '')
         ),
       others: {
         outlet_info: {
-          method: (data) =>
-            data.map((i) => ({ ...i, type: i.pointType + i.waterBodyId })),
+          method: data => data.map(i => ({ ...i, type: i.pointType + i.waterBodyId })),
         },
       },
     },
     //车辆
     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
         ),
     },
   };
   const other_data_params = {};
   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;
+    console.log('什么东西', k, keys[0]);
     if (k == keys[0]) appStore.SET_MapData(filterGeometryNotEmpty(data));
-    bus.emit("changeData");
+    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,
         })),
@@ -795,16 +706,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,
@@ -813,29 +724,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=f627fbb24176be73142eb0b5088d8683`
   );
-  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
           )
@@ -848,32 +754,32 @@
 const geoRegeo = async ({ name, lngLat, callback }) => {
   let flag,
     params = null;
-  if (name) (flag = "geo"), (params = `address=${name}`);
-  if (lngLat) (flag = "regeo"), (params = `location=${lngLat.join(",")}`);
-  if (!(flag || params)) console.log("name,lngLat is null!");
+  if (name) (flag = 'geo'), (params = `address=${name}`);
+  if (lngLat) (flag = 'regeo'), (params = `location=${lngLat.join(',')}`);
+  if (!(flag || params)) console.log('name,lngLat is null!');
   const results = await request(
     `/amap/v3/geocode/${flag}?${params}&extensions=all&output=json&key=f627fbb24176be73142eb0b5088d8683&city=420111`
   );
-  console.log("geoRegeo results", results);
+  console.log('geoRegeo results', results);
   callback && callback(results);
   return results;
 };
 
 //判断是否在打卡点内
 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
   );
 };
@@ -881,45 +787,43 @@
 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",
-    "clickPoint",
+    '问题管线',
+    '1_泵站',
+    '1_污水处理厂',
+    '1_调蓄池',
+    '分区流向',
+    '分区流向1',
+    'rainwater_pipeline_water_level',
+    'rainwater_pipeline_water_level_GWGSWYX',
+    'outlet_info1',
+    'temporary',
+    'highlight_linestring',
+    'highlight_polygon',
+    'highlight_point',
+    'clickPoint',
   ];
   clearRouteMethod();
-  const hideKeys = ["雨水系统流向", "雨水系统流向1", "排水分区_close"];
+  const hideKeys = ['雨水系统流向', '雨水系统流向1', '排水分区_close'];
   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;
-  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,
@@ -939,15 +843,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: {
@@ -967,29 +871,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,
@@ -998,29 +900,29 @@
   newfiberMap.addLayer(layer);
 };
 const events_params = {
-  removeMapDatas: { key: "removeMapDatas" },
-  setGeoJSON: { key: "setGeoJSON" },
-  setLayerVisible: { key: "setLayerVisible" },
-  beansToMap: { key: "beansToMap" },
-  closeAllLayer: { key: "closeAllLayer" },
-  setHighlight: { key: "setHighlight" },
-  geoRegeo: { key: "geoRegeo", method: geoRegeo },
-  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' },
+  geoRegeo: { key: 'geoRegeo', method: geoRegeo },
+  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 {
@@ -1030,10 +932,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 52989b9..33def0e 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>
 
   <PopupInfo>
     {{ item?.aaa }}
@@ -17,34 +11,34 @@
 </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_flow1 from "../../../public/static/libs/mapbox/json/ys_flow_2.json";
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
+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_flow1 from '../../../public/static/libs/mapbox/json/ys_flow_2.json';
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
 
-import outlet_route from "../../../public/static/libs/mapbox/json/outlet_route.json";
-import outlet_site from "../../../public/static/libs/mapbox/json/outlet_site.json";
+import outlet_route from '../../../public/static/libs/mapbox/json/outlet_route.json';
+import outlet_site from '../../../public/static/libs/mapbox/json/outlet_site.json';
 
-import PopupInfo from "@/components/Map/popup.vue";
-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 PopupInfo from '@/components/Map/popup.vue';
+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,
@@ -59,92 +53,92 @@
 const refreshTimer = ref(null);
 const default_params = {
   point: {
-    key: "point",
+    key: 'point',
     prevId: null,
     children: {
       outlet_info2: {
-        key: "outlet_info2",
+        key: 'outlet_info2',
       },
     },
   },
   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,
   },
   psfq: {
-    key: "排水分区",
-    text_key: "排水分区_text",
+    key: '排水分区',
+    text_key: '排水分区_text',
     prevIds: [],
     children: {
-      WS: { key: "污水分区" },
-      YS: { key: "雨水分区" },
+      WS: { key: '污水分区' },
+      YS: { key: '雨水分区' },
     },
   },
   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;
     })();
   const _keys = [
-    "rain_water_pump_station_info1",
-    "sewage_pump_station_info1",
-    "rainwater_pipeline_quality_area1",
-    "clickPoint",
-    "temporary",
+    'rain_water_pump_station_info1',
+    'sewage_pump_station_info1',
+    'rainwater_pipeline_quality_area1',
+    'clickPoint',
+    'temporary',
   ];
 
-  console.log("properties", properties, layerId);
+  console.log('properties', properties, layerId);
   // 图层点击事件
   if (properties) {
     if (properties.type == _keys[4]) properties.type = properties.pointType;
-    bus.emit("FenQuClick", { properties, layerId: layerId.split("_")[0] });
+    bus.emit('FenQuClick', { properties, layerId: layerId.split('_')[0] });
   }
   clearTrajectory();
   // clearTemporaryData();
-  proxy.$emit("map-click1", lngLat, properties, layerId);
+  proxy.$emit('map-click1', lngLat, properties, layerId);
   const { town, hupo, gangqu, hb_wh_dhgx_merge, psfq, point } = default_params;
   const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
 
@@ -153,11 +147,11 @@
     ysFlow();
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == "村域边界")[0]
+      .filter(i => i.newfiberId == '村域边界')[0]
       .setData(turf.featureCollection([]));
     busEmit(
       removeMapDatas.key,
-      _keys.filter((i) => i != (properties || {}).type)
+      _keys.filter(i => i != (properties || {}).type)
     );
 
     if (town.prevId) {
@@ -177,43 +171,31 @@
         showOutletInfo(properties);
       }*/
   })();
-  ((
-    {
+  (
+    ({
       [point.key]: () => {
         const { outlet_info2 } = point.children;
-        ((
-          {
-            [outlet_info2.key]: (properties) => {
+        (
+          ({
+            [outlet_info2.key]: properties => {
               clearRouteMethod();
               outletRouteMethod(properties);
             },
-          }[properties.type] || function () {}
-        )(properties));
+          })[properties.type] || function () {}
+        )(properties);
       },
       [psfq.key]: () => {
-        ["雨水系统流向", "雨水系统流向1"].forEach((k) =>
-          busEmit(setLayerVisible.key, { layername: k, isCheck: false })
+        ['雨水系统流向', '雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, { layername: k, isCheck: false }));
+        ['outlet_info2', '排口流向', '排口流向1', 'rainwater_pipeline_quality1', _keys[2]].forEach(k =>
+          busEmit(setLayerVisible.key, { layername: k, isCheck: true })
         );
-        [
-          "outlet_info2",
-          "排口流向",
-          "排口流向1",
-          "rainwater_pipeline_quality1",
-          _keys[2],
-        ].forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
         areaToMap(properties);
       },
       [psfq.text_key]: () => {
-        ["雨水系统流向", "雨水系统流向1"].forEach((k) =>
-          busEmit(setLayerVisible.key, { layername: k, isCheck: false })
+        ['雨水系统流向', '雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, { layername: k, isCheck: false }));
+        ['outlet_info2', '排口流向', '排口流向1', 'rainwater_pipeline_quality1', _keys[2]].forEach(k =>
+          busEmit(setLayerVisible.key, { layername: k, isCheck: true })
         );
-        [
-          "outlet_info2",
-          "排口流向",
-          "排口流向1",
-          "rainwater_pipeline_quality1",
-          _keys[2],
-        ].forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
         areaToMap({
           ...properties,
           geometry: Terraformer.WKT.convert(JSON.parse(properties.geometrys)),
@@ -222,12 +204,10 @@
       [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 });
@@ -239,38 +219,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,
@@ -281,27 +253,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,
@@ -310,13 +276,13 @@
       },
       [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);
           districtMask(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);
@@ -328,39 +294,30 @@
                            busEmit(setHighlight.key, turf.flatten(turf.featureCollection(features)).features);*/
         }
       },
-    }[layerId] ||
+    })[layerId] ||
     function () {
       //newfiberMap.map.easeTo(newfiberMap.config_.params.init);
     }
-  )());
+  )();
 
   function areaToMap(properties) {
     clearRouteMethod();
-    properties.level == "1" && !layerId
-      ? newfiberMap.map.easeTo(newfiberMap.config_.params.init)
-      : districtMask(properties);
-    properties.level == "2" && showOutletInfo(properties);
-    if (properties.level == "3" && properties.type == "YS") {
-      ys_flow(
-        { ...properties, c_layer: `排水分区_${properties.type}_${properties.level}` },
-        true
-      );
+    properties.level == '1' && !layerId ? newfiberMap.map.easeTo(newfiberMap.config_.params.init) : districtMask(properties);
+    properties.level == '2' && showOutletInfo(properties);
+    if (properties.level == '3' && properties.type == 'YS') {
+      ys_flow({ ...properties, c_layer: `排水分区_${properties.type}_${properties.level}` }, true);
       let ids = newfiberMap.map
-        .getSource(newfiberMap.map.getLayer("排水分区").source)
-        ._data.features.filter(
-          (i) => i.properties.p_type == properties.type + properties.name
-        )
-        .map((i) => i.properties.id);
-      let p_feature = turf.flatten(
-        turf.feature(Terraformer.WKT.parse(properties.geometry))
-      ).features[0];
+        .getSource(newfiberMap.map.getLayer('排水分区').source)
+        ._data.features.filter(i => i.properties.p_type == properties.type + properties.name)
+        .map(i => i.properties.id);
+      let p_feature = turf.flatten(turf.feature(Terraformer.WKT.parse(properties.geometry))).features[0];
 
       let features = newfiberMap.map
-        .getSource("point")
-        ._data.features.filter((i) => _keys[2].includes(i.properties.type))
-        .filter((o) => turf.booleanPointInPolygon(o, p_feature));
+        .getSource('point')
+        ._data.features.filter(i => _keys[2].includes(i.properties.type))
+        .filter(o => turf.booleanPointInPolygon(o, p_feature));
       // .filter(i => ids.includes(Number(i.properties.waterRegionId)));
-      features = features.map((i) =>
+      features = features.map(i =>
         Object.assign(_.cloneDeep(i), {
           properties: { ...i.properties, type: i.properties.type + 1 },
         })
@@ -374,11 +331,7 @@
       layername: psfq.children[properties.type].key,
       isCheck: false,
       values: Array.from(
-        new Set(
-          newfiberMap.map
-            .getSource("hb_wh_dhgx_psfq_geometrys")
-            ._data.features.map((i) => i.properties.p_type)
-        )
+        new Set(newfiberMap.map.getSource('hb_wh_dhgx_psfq_geometrys')._data.features.map(i => i.properties.p_type))
       ),
     });
     busEmit(setLayerVisible.key, {
@@ -386,12 +339,11 @@
       isCheck: true,
       values: [openLayer],
     });
-    if (layerId && psfq.prevIds.filter((i) => i.id == properties.id).length == 0)
-      psfq.prevIds.push(properties);
+    if (layerId && psfq.prevIds.filter(i => i.id == properties.id).length == 0) psfq.prevIds.push(properties);
   }
 
   function showOutletInfo(properties) {
-    const key = "outlet_info";
+    const key = 'outlet_info';
     busEmit(setLayerVisible.key, {
       layername: key + properties.w_id,
       isCheck: Boolean(layerId),
@@ -399,23 +351,19 @@
   }
 
   function outletRouteMethod(properties) {
-    const _keys = ["排口流向", "排口流向1", "rainwater_pipeline_quality1"];
-    _keys.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
+    const _keys = ['排口流向', '排口流向1', 'rainwater_pipeline_quality1'];
+    _keys.forEach(k => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
     let sites = turf.featureCollection(
       outlet_site.features.filter(
-        (i) =>
-          (i.properties.outlet_id || "").split(",").includes(properties.id) &&
-          i.properties.connectType != "area"
+        i => (i.properties.outlet_id || '').split(',').includes(properties.id) && i.properties.connectType != 'area'
       )
     );
     let routes = turf.featureCollection(
-      outlet_route.features.filter((i) =>
-        (i.properties.outlet_id || "").split(",").includes(properties.id)
-      )
+      outlet_route.features.filter(i => (i.properties.outlet_id || '').split(',').includes(properties.id))
     );
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == _keys[1])[0]
+      .filter(i => i.newfiberId == _keys[1])[0]
       .setData(routes);
     busEmit(setGeoJSON.key, { json: routes, key: _keys[0] });
     busEmit(setGeoJSON.key, { json: sites, key: _keys[2] });
@@ -439,57 +387,46 @@
     }
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == "蒙版")[0]
+      .filter(i => i.newfiberId == '蒙版')[0]
       .setData(turf.featureCollection(feature));
   }
 
   function ys_flow(properties, visible) {
-    const keys = ["雨水系统流向", "雨水系统流向1"];
-    if (!visible)
-      return keys.forEach((key) =>
-        busEmit(setLayerVisible.key, { layername: key, isCheck: visible })
-      );
-    const layerSplit = properties.c_layer.split("_");
+    const keys = ['雨水系统流向', '雨水系统流向1'];
+    if (!visible) return keys.forEach(key => busEmit(setLayerVisible.key, { layername: key, isCheck: visible }));
+    const layerSplit = properties.c_layer.split('_');
     const level = layerSplit[2];
     let features = ys_flow1.features.filter(
-      (i) =>
-        i.properties.level_ == level &&
-        (level == "1" || i.properties["area_" + level] == properties.name)
+      i => i.properties.level_ == level && (level == '1' || i.properties['area_' + level] == properties.name)
     );
     const p = properties.name.substr(0, 2);
     let feature =
-      level == "3"
-        ? ys_flow1.features.filter((i) =>
-            (i.properties.bind || "").includes(properties.name)
-          )
-        : ys_flow1.features.filter(
-            (i) => i.properties.level_ < level && i.properties.area_2.includes(p)
-          );
+      level == '3'
+        ? ys_flow1.features.filter(i => (i.properties.bind || '').includes(properties.name))
+        : ys_flow1.features.filter(i => i.properties.level_ < level && i.properties.area_2.includes(p));
     ysFlow(turf.featureCollection(features.concat(feature)));
-    keys.forEach((key) =>
-      busEmit(setLayerVisible.key, { layername: key, isCheck: visible })
-    );
+    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) =>
             bus.emit("setGeoJSON", {
@@ -515,24 +452,22 @@
 
 function clearRouteMethod() {
   const { removeMapDatas } = events_params;
-  const _keys = ["排口流向", "排口流向1", "rainwater_pipeline_quality1"];
+  const _keys = ['排口流向', '排口流向1', 'rainwater_pipeline_quality1'];
   busEmit(removeMapDatas.key, [_keys[2], _keys[0]]);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == _keys[1])[0]
+    .filter(i => i.newfiberId == _keys[1])[0]
     .setData(turf.featureCollection([]));
 }
 
 function setHighlight_(properties = {}) {
-  const temporary = "temporary";
-  bus.emit("removeMapDatas", [temporary]);
-  if (!properties.geometry || properties.geometry.includes("POINT")) return;
+  const temporary = 'temporary';
+  bus.emit('removeMapDatas', [temporary]);
+  if (!properties.geometry || properties.geometry.includes('POINT')) 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]
@@ -542,49 +477,45 @@
 const getModalData = () => {
   isClockInRange();
   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({});
   createPopup();
   busEmit(events_params.closeAllLayer.key);
-  proxy.$emit("loadCallback");
+  proxy.$emit('loadCallback');
   ww();
   ysFlow();
 
   newfiberMap.contextMenu = new mapboxgl1.ContextMenu({
     items: [
       {
-        text: "街景",
+        text: '街景',
         callback: async (point1, feature, layerId) => {
-          console.log("周边街景经纬度1", point1);
+          console.log('周边街景经纬度1', point1);
           let point = _.cloneDeep(point1);
           let clickPoint = turf.point(Object.values(point));
-          let positionAddress = "";
+          let positionAddress = '';
           gcoord.transform(clickPoint, gcoord.WGS84, gcoord.BD09);
           let data = await request(
-            `/bdApi//baiduservice/panorama?fov=180&height=256&width=512&location=${turf
-              .getCoords(clickPoint)
-              .join(",")}`
+            `/bdApi//baiduservice/panorama?fov=180&height=256&width=512&location=${turf.getCoords(clickPoint).join(',')}`
           );
-          data.data.base64 =
-            data && data.data && "data:image/jpeg;base64," + data.data.base64;
+          data.data.base64 = data && data.data && 'data:image/jpeg;base64,' + data.data.base64;
           gcoord.transform(clickPoint, gcoord.BD09, gcoord.GCJ02);
           const regeodata = await geoRegeo({ lngLat: turf.getCoords(clickPoint) });
-          positionAddress =
-            regeodata.info === "OK" && regeodata.regeocode.formatted_address;
+          positionAddress = regeodata.info === 'OK' && regeodata.regeocode.formatted_address;
           gcoord.transform(clickPoint, gcoord.GCJ02, gcoord.WGS84);
           busEmit(events_params.setGeoJSON.key, {
             json: turf.featureCollection([clickPoint]),
-            key: "clickPoint",
+            key: 'clickPoint',
           });
-          data.stName = positionAddress;
-          bus.emit("popupcontent", {
+          data.roadName = positionAddress;
+          bus.emit('popupcontent', {
             popupShow: true,
             point: turf.getCoords(clickPoint),
             popupInfo: data,
           });
-          console.log("周边街景经纬度2", turf.getCoords(clickPoint));
+          console.log('周边街景经纬度2', turf.getCoords(clickPoint));
         },
       },
     ],
@@ -592,38 +523,34 @@
   newfiberMap.contextMenu.addTo(newfiberMap.map);
 };
 
-const ysFlow = (geojson) => {
-  const key = "雨水系统流向";
-  const widths = ["", 10, 5, 1];
+const ysFlow = geojson => {
+  const key = '雨水系统流向';
+  const widths = ['', 10, 5, 1];
   if (!geojson) {
-    ys_flow1.features = ys_flow1.features.map((i) => ({
+    ys_flow1.features = ys_flow1.features.map(i => ({
       ...i,
       properties: {
         ...i.properties,
-        color: "rgba(10,170,249,1)",
+        color: 'rgba(10,170,249,1)',
         width: widths[i.properties.level_],
         name: undefined,
       },
     }));
-    geojson = turf.featureCollection(
-      ys_flow1.features.filter((i) => i.properties.level_ == 1)
-    );
+    geojson = turf.featureCollection(ys_flow1.features.filter(i => i.properties.level_ == 1));
   }
-  bus.emit("removeMapDatas", [key + "1"]);
+  bus.emit('removeMapDatas', [key + '1']);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == key)[0]
+    .filter(i => i.newfiberId == key)[0]
     .setData(geojson);
   busEmit(events_params.setGeoJSON.key, { json: geojson, 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],
@@ -631,44 +558,35 @@
 };
 
 let prevObj = null;
-const panelDataToMap = (obj) => {
-  let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件  默认触发
+const panelDataToMap = obj => {
+  let isUp = Object.keys(obj).includes('isUp') ? obj.isUp : true; //是否触发地图点击事件  默认触发
   // 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_psfq_geometrys",
-    "hb_wh_dhgx_merge",
-  ]
-    .map((key) =>
+  let features = ['point', 'linestring', 'polygon', 'hb_wh_dhgx_psfq_geometrys', '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.p_type)[0] ||
-    features.filter((i) => i.properties.name == obj.name)[0] ||
+    features.filter(i => i.properties.p_type)[0] ||
+    features.filter(i => i.properties.name == obj.name)[0] ||
     features[_.random(0, features.length - 1)];
-  console.log("feature.properties.p_type&&isUp", feature.properties.p_type && isUp);
-  if (feature.properties.p_type && isUp)
-    return mapClickEvt(undefined, feature.properties, "排水分区");
+  console.log('feature.properties.p_type&&isUp', feature.properties.p_type && isUp);
+  if (feature.properties.p_type && isUp) return mapClickEvt(undefined, feature.properties, '排水分区');
   if (!feature) return;
   busEmit(setHighlight.key, [feature]);
   mapCenterByData(turf.bbox(feature));
 };
 
-const mapCenterByData = (bbox) => {
+const mapCenterByData = bbox => {
   newfiberMap.map.fitBounds(
     [
       [bbox[0], bbox[1]],
@@ -677,29 +595,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 = () => {
@@ -712,55 +625,53 @@
   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 : '')
         ),
       others: {
         outlet_info: {
-          method: (data) =>
-            data.map((i) => ({ ...i, type: i.pointType + i.waterBodyId })),
+          method: data => data.map(i => ({ ...i, type: i.pointType + i.waterBodyId })),
         },
       },
     },
     //车辆
     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
         ),
     },
   };
   const other_data_params = {};
   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;
+    console.log('什么东西', k, keys[0]);
     if (k == keys[0]) appStore.SET_MapData(filterGeometryNotEmpty(data));
-    bus.emit("changeData");
+    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,
         })),
@@ -795,16 +706,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,
@@ -813,29 +724,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=f627fbb24176be73142eb0b5088d8683`
   );
-  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
           )
@@ -848,32 +754,32 @@
 const geoRegeo = async ({ name, lngLat, callback }) => {
   let flag,
     params = null;
-  if (name) (flag = "geo"), (params = `address=${name}`);
-  if (lngLat) (flag = "regeo"), (params = `location=${lngLat.join(",")}`);
-  if (!(flag || params)) console.log("name,lngLat is null!");
+  if (name) (flag = 'geo'), (params = `address=${name}`);
+  if (lngLat) (flag = 'regeo'), (params = `location=${lngLat.join(',')}`);
+  if (!(flag || params)) console.log('name,lngLat is null!');
   const results = await request(
     `/amap/v3/geocode/${flag}?${params}&extensions=all&output=json&key=f627fbb24176be73142eb0b5088d8683&city=420111`
   );
-  console.log("geoRegeo results", results);
+  console.log('geoRegeo results', results);
   callback && callback(results);
   return results;
 };
 
 //判断是否在打卡点内
 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
   );
 };
@@ -881,45 +787,43 @@
 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",
-    "clickPoint",
+    '问题管线',
+    '1_泵站',
+    '1_污水处理厂',
+    '1_调蓄池',
+    '分区流向',
+    '分区流向1',
+    'rainwater_pipeline_water_level',
+    'rainwater_pipeline_water_level_GWGSWYX',
+    'outlet_info1',
+    'temporary',
+    'highlight_linestring',
+    'highlight_polygon',
+    'highlight_point',
+    'clickPoint',
   ];
   clearRouteMethod();
-  const hideKeys = ["雨水系统流向", "雨水系统流向1", "排水分区_close"];
+  const hideKeys = ['雨水系统流向', '雨水系统流向1', '排水分区_close'];
   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;
-  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,
@@ -939,15 +843,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: {
@@ -967,29 +871,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,
@@ -998,29 +900,29 @@
   newfiberMap.addLayer(layer);
 };
 const events_params = {
-  removeMapDatas: { key: "removeMapDatas" },
-  setGeoJSON: { key: "setGeoJSON" },
-  setLayerVisible: { key: "setLayerVisible" },
-  beansToMap: { key: "beansToMap" },
-  closeAllLayer: { key: "closeAllLayer" },
-  setHighlight: { key: "setHighlight" },
-  geoRegeo: { key: "geoRegeo", method: geoRegeo },
-  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' },
+  geoRegeo: { key: 'geoRegeo', method: geoRegeo },
+  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 {
@@ -1030,10 +932,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/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index e910189..ad908cf 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -15,7 +15,7 @@
         <el-tab-pane label="资产" name="zhandian"></el-tab-pane>
         <el-tab-pane label="道路" name="daolu"></el-tab-pane>
       </el-tabs>
-      <el-option v-for="(item, index) in filterList" :key="item.id + index + item.id" :label="item.name" :value="item.geometry">
+      <el-option v-for="(item, index) in filterList" :key="item.pointTypeId" :label="item.name" :value="item.pointTypeId">
         <el-tooltip
           effect="dark"
           :content="item.name"
@@ -56,46 +56,47 @@
 const getItem = ref({});
 // 道路数据
 const roadData = ref([
-  {
-    data: [
-      {
-        id: 1,
-        name: '软件园中路',
-        geometry: '',
-        pointTypeName: '什么什么路',
-      },
-      {
-        id: 2,
-        name: '光谷大道',
-        geometry: '',
-        pointTypeName: '什么路',
-      },
-      {
-        id: 3,
-        name: '光谷大道1',
-        geometry: '',
-        pointTypeName: '什么路',
-      },
-      {
-        id: 4,
-        name: '光谷大道3',
-        geometry: '',
-        pointTypeName: '什么路',
-      },
-      {
-        id: 5,
-        name: '关山大道',
-        geometry: '',
-        pointTypeName: '1什么路',
-      },
-    ],
-  },
+  // {
+  //   data: [
+  //     {
+  //       id: 1,
+  //       name: '软件园中路',
+  //       geometry: '',
+  //       pointTypeName: '什么什么路',
+  //     },
+  //     {
+  //       id: 2,
+  //       name: '光谷大道',
+  //       geometry: '',
+  //       pointTypeName: '什么路',
+  //     },
+  //     {
+  //       id: 3,
+  //       name: '光谷大道1',
+  //       geometry: '',
+  //       pointTypeName: '什么路',
+  //     },
+  //     {
+  //       id: 4,
+  //       name: '光谷大道3',
+  //       geometry: '',
+  //       pointTypeName: '什么路',
+  //     },
+  //     {
+  //       id: 5,
+  //       name: '关山大道',
+  //       geometry: '',
+  //       pointTypeName: '1什么路',
+  //     },
+  //   ],
+  // },
 ]);
 watch(
   () => appStore.MapData,
   (newValue, oldValue) => {
     if (appStore.MapData && appStore.MapData.length) {
       if (number.value === 1) {
+        console.log('aaaa', appStore.MapData);
         GetSearchList(appStore.MapData);
         number.value = 4;
       }
@@ -110,63 +111,51 @@
   data.map(item => {
     SelectList.value = SelectList.value.concat(item.data);
   });
-  // console.log('MapData', appStore.MapData, SelectList.value);
+  console.log('MapData', appStore.MapData, SelectList.value);
   filterList.value = JSON.parse(JSON.stringify(SelectList.value));
   // debugger;
 }
 
 // 值改变后的操作
 function selectchange(value) {
-  console.log('valuevalue',value);
+  console.log('valuevalue', value);
   if (value) {
     let arr = SelectList.value.filter(item => {
-      return item.geometry == value;
+      return item.pointTypeId == value;
     });
+    console.log('arr', arr);
+
     if (arr && arr[0]) {
       getItem.value = arr[0];
     }
     selectmodel.value = getItem.value.name;
-    let feature = turf.feature(Terraformer.WKT.parse(value), _.cloneDeep(getItem.value));
-    console.log('feature',feature);
+    let feature = turf.feature(Terraformer.WKT.parse(getItem.value.geometry), _.cloneDeep(getItem.value));
+    console.log('feature', feature);
     bus.emit('setHighlight', feature);
     newfiberMap.map.easeTo({ center: turf.getCoords(turf.center(feature)), zoom: 15 });
     bus.emit('setGeoJSON', { json: turf.featureCollection([feature]), key: 'temporary' });
   }
-
-  /*  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);
-  }*/
 }
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-      bus.emit('geoRegeo', {
-        name: value,
-        callback: results => {
-          if(!results.geocodes) return;
-          roadData.value = [
-            {
-              data:results.geocodes.map((i, idx) => ({
-                id: idx,
-                name: i.formatted_address,
-                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-                pointTypeName: '地理位置',
-              }))
-            }
-          ];
-          console.log('roadData.value',roadData.value);
-        },
-      });
+    bus.emit('geoRegeo', {
+      name: value,
+      callback: results => {
+        if (!results.geocodes) return;
+        roadData.value = [
+          {
+            data: results.geocodes.map((i, idx) => ({
+              id: idx,
+              name: i.formatted_address,
+              geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+              pointTypeName: '地理位置',
+            })),
+          },
+        ];
+        console.log('roadData.value', roadData.value);
+      },
+    });
   } else {
     filterList.value = SelectList.value;
   }
@@ -185,7 +174,7 @@
 };
 onMounted(() => {
   bus.on('YQ_head', val => {
-    console.log('appStore.MapData', appStore.MapData);
+    console.log('appStore.MapData', appStore.MapData, val);
     if (val == false) {
       Show.value = false;
     } else {

diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 52989b9..33def0e 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>
 
   <PopupInfo>
     {{ item?.aaa }}
@@ -17,34 +11,34 @@
 </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_flow1 from "../../../public/static/libs/mapbox/json/ys_flow_2.json";
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
+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_flow1 from '../../../public/static/libs/mapbox/json/ys_flow_2.json';
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
 
-import outlet_route from "../../../public/static/libs/mapbox/json/outlet_route.json";
-import outlet_site from "../../../public/static/libs/mapbox/json/outlet_site.json";
+import outlet_route from '../../../public/static/libs/mapbox/json/outlet_route.json';
+import outlet_site from '../../../public/static/libs/mapbox/json/outlet_site.json';
 
-import PopupInfo from "@/components/Map/popup.vue";
-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 PopupInfo from '@/components/Map/popup.vue';
+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,
@@ -59,92 +53,92 @@
 const refreshTimer = ref(null);
 const default_params = {
   point: {
-    key: "point",
+    key: 'point',
     prevId: null,
     children: {
       outlet_info2: {
-        key: "outlet_info2",
+        key: 'outlet_info2',
       },
     },
   },
   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,
   },
   psfq: {
-    key: "排水分区",
-    text_key: "排水分区_text",
+    key: '排水分区',
+    text_key: '排水分区_text',
     prevIds: [],
     children: {
-      WS: { key: "污水分区" },
-      YS: { key: "雨水分区" },
+      WS: { key: '污水分区' },
+      YS: { key: '雨水分区' },
     },
   },
   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;
     })();
   const _keys = [
-    "rain_water_pump_station_info1",
-    "sewage_pump_station_info1",
-    "rainwater_pipeline_quality_area1",
-    "clickPoint",
-    "temporary",
+    'rain_water_pump_station_info1',
+    'sewage_pump_station_info1',
+    'rainwater_pipeline_quality_area1',
+    'clickPoint',
+    'temporary',
   ];
 
-  console.log("properties", properties, layerId);
+  console.log('properties', properties, layerId);
   // 图层点击事件
   if (properties) {
     if (properties.type == _keys[4]) properties.type = properties.pointType;
-    bus.emit("FenQuClick", { properties, layerId: layerId.split("_")[0] });
+    bus.emit('FenQuClick', { properties, layerId: layerId.split('_')[0] });
   }
   clearTrajectory();
   // clearTemporaryData();
-  proxy.$emit("map-click1", lngLat, properties, layerId);
+  proxy.$emit('map-click1', lngLat, properties, layerId);
   const { town, hupo, gangqu, hb_wh_dhgx_merge, psfq, point } = default_params;
   const { setLayerVisible, setHighlight, setGeoJSON, removeMapDatas } = events_params;
 
@@ -153,11 +147,11 @@
     ysFlow();
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == "村域边界")[0]
+      .filter(i => i.newfiberId == '村域边界')[0]
       .setData(turf.featureCollection([]));
     busEmit(
       removeMapDatas.key,
-      _keys.filter((i) => i != (properties || {}).type)
+      _keys.filter(i => i != (properties || {}).type)
     );
 
     if (town.prevId) {
@@ -177,43 +171,31 @@
         showOutletInfo(properties);
       }*/
   })();
-  ((
-    {
+  (
+    ({
       [point.key]: () => {
         const { outlet_info2 } = point.children;
-        ((
-          {
-            [outlet_info2.key]: (properties) => {
+        (
+          ({
+            [outlet_info2.key]: properties => {
               clearRouteMethod();
               outletRouteMethod(properties);
             },
-          }[properties.type] || function () {}
-        )(properties));
+          })[properties.type] || function () {}
+        )(properties);
       },
       [psfq.key]: () => {
-        ["雨水系统流向", "雨水系统流向1"].forEach((k) =>
-          busEmit(setLayerVisible.key, { layername: k, isCheck: false })
+        ['雨水系统流向', '雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, { layername: k, isCheck: false }));
+        ['outlet_info2', '排口流向', '排口流向1', 'rainwater_pipeline_quality1', _keys[2]].forEach(k =>
+          busEmit(setLayerVisible.key, { layername: k, isCheck: true })
         );
-        [
-          "outlet_info2",
-          "排口流向",
-          "排口流向1",
-          "rainwater_pipeline_quality1",
-          _keys[2],
-        ].forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
         areaToMap(properties);
       },
       [psfq.text_key]: () => {
-        ["雨水系统流向", "雨水系统流向1"].forEach((k) =>
-          busEmit(setLayerVisible.key, { layername: k, isCheck: false })
+        ['雨水系统流向', '雨水系统流向1'].forEach(k => busEmit(setLayerVisible.key, { layername: k, isCheck: false }));
+        ['outlet_info2', '排口流向', '排口流向1', 'rainwater_pipeline_quality1', _keys[2]].forEach(k =>
+          busEmit(setLayerVisible.key, { layername: k, isCheck: true })
         );
-        [
-          "outlet_info2",
-          "排口流向",
-          "排口流向1",
-          "rainwater_pipeline_quality1",
-          _keys[2],
-        ].forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
         areaToMap({
           ...properties,
           geometry: Terraformer.WKT.convert(JSON.parse(properties.geometrys)),
@@ -222,12 +204,10 @@
       [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 });
@@ -239,38 +219,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,
@@ -281,27 +253,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,
@@ -310,13 +276,13 @@
       },
       [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);
           districtMask(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);
@@ -328,39 +294,30 @@
                            busEmit(setHighlight.key, turf.flatten(turf.featureCollection(features)).features);*/
         }
       },
-    }[layerId] ||
+    })[layerId] ||
     function () {
       //newfiberMap.map.easeTo(newfiberMap.config_.params.init);
     }
-  )());
+  )();
 
   function areaToMap(properties) {
     clearRouteMethod();
-    properties.level == "1" && !layerId
-      ? newfiberMap.map.easeTo(newfiberMap.config_.params.init)
-      : districtMask(properties);
-    properties.level == "2" && showOutletInfo(properties);
-    if (properties.level == "3" && properties.type == "YS") {
-      ys_flow(
-        { ...properties, c_layer: `排水分区_${properties.type}_${properties.level}` },
-        true
-      );
+    properties.level == '1' && !layerId ? newfiberMap.map.easeTo(newfiberMap.config_.params.init) : districtMask(properties);
+    properties.level == '2' && showOutletInfo(properties);
+    if (properties.level == '3' && properties.type == 'YS') {
+      ys_flow({ ...properties, c_layer: `排水分区_${properties.type}_${properties.level}` }, true);
       let ids = newfiberMap.map
-        .getSource(newfiberMap.map.getLayer("排水分区").source)
-        ._data.features.filter(
-          (i) => i.properties.p_type == properties.type + properties.name
-        )
-        .map((i) => i.properties.id);
-      let p_feature = turf.flatten(
-        turf.feature(Terraformer.WKT.parse(properties.geometry))
-      ).features[0];
+        .getSource(newfiberMap.map.getLayer('排水分区').source)
+        ._data.features.filter(i => i.properties.p_type == properties.type + properties.name)
+        .map(i => i.properties.id);
+      let p_feature = turf.flatten(turf.feature(Terraformer.WKT.parse(properties.geometry))).features[0];
 
       let features = newfiberMap.map
-        .getSource("point")
-        ._data.features.filter((i) => _keys[2].includes(i.properties.type))
-        .filter((o) => turf.booleanPointInPolygon(o, p_feature));
+        .getSource('point')
+        ._data.features.filter(i => _keys[2].includes(i.properties.type))
+        .filter(o => turf.booleanPointInPolygon(o, p_feature));
       // .filter(i => ids.includes(Number(i.properties.waterRegionId)));
-      features = features.map((i) =>
+      features = features.map(i =>
         Object.assign(_.cloneDeep(i), {
           properties: { ...i.properties, type: i.properties.type + 1 },
         })
@@ -374,11 +331,7 @@
       layername: psfq.children[properties.type].key,
       isCheck: false,
       values: Array.from(
-        new Set(
-          newfiberMap.map
-            .getSource("hb_wh_dhgx_psfq_geometrys")
-            ._data.features.map((i) => i.properties.p_type)
-        )
+        new Set(newfiberMap.map.getSource('hb_wh_dhgx_psfq_geometrys')._data.features.map(i => i.properties.p_type))
       ),
     });
     busEmit(setLayerVisible.key, {
@@ -386,12 +339,11 @@
       isCheck: true,
       values: [openLayer],
     });
-    if (layerId && psfq.prevIds.filter((i) => i.id == properties.id).length == 0)
-      psfq.prevIds.push(properties);
+    if (layerId && psfq.prevIds.filter(i => i.id == properties.id).length == 0) psfq.prevIds.push(properties);
   }
 
   function showOutletInfo(properties) {
-    const key = "outlet_info";
+    const key = 'outlet_info';
     busEmit(setLayerVisible.key, {
       layername: key + properties.w_id,
       isCheck: Boolean(layerId),
@@ -399,23 +351,19 @@
   }
 
   function outletRouteMethod(properties) {
-    const _keys = ["排口流向", "排口流向1", "rainwater_pipeline_quality1"];
-    _keys.forEach((k) => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
+    const _keys = ['排口流向', '排口流向1', 'rainwater_pipeline_quality1'];
+    _keys.forEach(k => busEmit(setLayerVisible.key, { layername: k, isCheck: true }));
     let sites = turf.featureCollection(
       outlet_site.features.filter(
-        (i) =>
-          (i.properties.outlet_id || "").split(",").includes(properties.id) &&
-          i.properties.connectType != "area"
+        i => (i.properties.outlet_id || '').split(',').includes(properties.id) && i.properties.connectType != 'area'
       )
     );
     let routes = turf.featureCollection(
-      outlet_route.features.filter((i) =>
-        (i.properties.outlet_id || "").split(",").includes(properties.id)
-      )
+      outlet_route.features.filter(i => (i.properties.outlet_id || '').split(',').includes(properties.id))
     );
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == _keys[1])[0]
+      .filter(i => i.newfiberId == _keys[1])[0]
       .setData(routes);
     busEmit(setGeoJSON.key, { json: routes, key: _keys[0] });
     busEmit(setGeoJSON.key, { json: sites, key: _keys[2] });
@@ -439,57 +387,46 @@
     }
     newfiberMap
       .getLayers()
-      .filter((i) => i.newfiberId == "蒙版")[0]
+      .filter(i => i.newfiberId == '蒙版')[0]
       .setData(turf.featureCollection(feature));
   }
 
   function ys_flow(properties, visible) {
-    const keys = ["雨水系统流向", "雨水系统流向1"];
-    if (!visible)
-      return keys.forEach((key) =>
-        busEmit(setLayerVisible.key, { layername: key, isCheck: visible })
-      );
-    const layerSplit = properties.c_layer.split("_");
+    const keys = ['雨水系统流向', '雨水系统流向1'];
+    if (!visible) return keys.forEach(key => busEmit(setLayerVisible.key, { layername: key, isCheck: visible }));
+    const layerSplit = properties.c_layer.split('_');
     const level = layerSplit[2];
     let features = ys_flow1.features.filter(
-      (i) =>
-        i.properties.level_ == level &&
-        (level == "1" || i.properties["area_" + level] == properties.name)
+      i => i.properties.level_ == level && (level == '1' || i.properties['area_' + level] == properties.name)
     );
     const p = properties.name.substr(0, 2);
     let feature =
-      level == "3"
-        ? ys_flow1.features.filter((i) =>
-            (i.properties.bind || "").includes(properties.name)
-          )
-        : ys_flow1.features.filter(
-            (i) => i.properties.level_ < level && i.properties.area_2.includes(p)
-          );
+      level == '3'
+        ? ys_flow1.features.filter(i => (i.properties.bind || '').includes(properties.name))
+        : ys_flow1.features.filter(i => i.properties.level_ < level && i.properties.area_2.includes(p));
     ysFlow(turf.featureCollection(features.concat(feature)));
-    keys.forEach((key) =>
-      busEmit(setLayerVisible.key, { layername: key, isCheck: visible })
-    );
+    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) =>
             bus.emit("setGeoJSON", {
@@ -515,24 +452,22 @@
 
 function clearRouteMethod() {
   const { removeMapDatas } = events_params;
-  const _keys = ["排口流向", "排口流向1", "rainwater_pipeline_quality1"];
+  const _keys = ['排口流向', '排口流向1', 'rainwater_pipeline_quality1'];
   busEmit(removeMapDatas.key, [_keys[2], _keys[0]]);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == _keys[1])[0]
+    .filter(i => i.newfiberId == _keys[1])[0]
     .setData(turf.featureCollection([]));
 }
 
 function setHighlight_(properties = {}) {
-  const temporary = "temporary";
-  bus.emit("removeMapDatas", [temporary]);
-  if (!properties.geometry || properties.geometry.includes("POINT")) return;
+  const temporary = 'temporary';
+  bus.emit('removeMapDatas', [temporary]);
+  if (!properties.geometry || properties.geometry.includes('POINT')) 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]
@@ -542,49 +477,45 @@
 const getModalData = () => {
   isClockInRange();
   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({});
   createPopup();
   busEmit(events_params.closeAllLayer.key);
-  proxy.$emit("loadCallback");
+  proxy.$emit('loadCallback');
   ww();
   ysFlow();
 
   newfiberMap.contextMenu = new mapboxgl1.ContextMenu({
     items: [
       {
-        text: "街景",
+        text: '街景',
         callback: async (point1, feature, layerId) => {
-          console.log("周边街景经纬度1", point1);
+          console.log('周边街景经纬度1', point1);
           let point = _.cloneDeep(point1);
           let clickPoint = turf.point(Object.values(point));
-          let positionAddress = "";
+          let positionAddress = '';
           gcoord.transform(clickPoint, gcoord.WGS84, gcoord.BD09);
           let data = await request(
-            `/bdApi//baiduservice/panorama?fov=180&height=256&width=512&location=${turf
-              .getCoords(clickPoint)
-              .join(",")}`
+            `/bdApi//baiduservice/panorama?fov=180&height=256&width=512&location=${turf.getCoords(clickPoint).join(',')}`
           );
-          data.data.base64 =
-            data && data.data && "data:image/jpeg;base64," + data.data.base64;
+          data.data.base64 = data && data.data && 'data:image/jpeg;base64,' + data.data.base64;
           gcoord.transform(clickPoint, gcoord.BD09, gcoord.GCJ02);
           const regeodata = await geoRegeo({ lngLat: turf.getCoords(clickPoint) });
-          positionAddress =
-            regeodata.info === "OK" && regeodata.regeocode.formatted_address;
+          positionAddress = regeodata.info === 'OK' && regeodata.regeocode.formatted_address;
           gcoord.transform(clickPoint, gcoord.GCJ02, gcoord.WGS84);
           busEmit(events_params.setGeoJSON.key, {
             json: turf.featureCollection([clickPoint]),
-            key: "clickPoint",
+            key: 'clickPoint',
           });
-          data.stName = positionAddress;
-          bus.emit("popupcontent", {
+          data.roadName = positionAddress;
+          bus.emit('popupcontent', {
             popupShow: true,
             point: turf.getCoords(clickPoint),
             popupInfo: data,
           });
-          console.log("周边街景经纬度2", turf.getCoords(clickPoint));
+          console.log('周边街景经纬度2', turf.getCoords(clickPoint));
         },
       },
     ],
@@ -592,38 +523,34 @@
   newfiberMap.contextMenu.addTo(newfiberMap.map);
 };
 
-const ysFlow = (geojson) => {
-  const key = "雨水系统流向";
-  const widths = ["", 10, 5, 1];
+const ysFlow = geojson => {
+  const key = '雨水系统流向';
+  const widths = ['', 10, 5, 1];
   if (!geojson) {
-    ys_flow1.features = ys_flow1.features.map((i) => ({
+    ys_flow1.features = ys_flow1.features.map(i => ({
       ...i,
       properties: {
         ...i.properties,
-        color: "rgba(10,170,249,1)",
+        color: 'rgba(10,170,249,1)',
         width: widths[i.properties.level_],
         name: undefined,
       },
     }));
-    geojson = turf.featureCollection(
-      ys_flow1.features.filter((i) => i.properties.level_ == 1)
-    );
+    geojson = turf.featureCollection(ys_flow1.features.filter(i => i.properties.level_ == 1));
   }
-  bus.emit("removeMapDatas", [key + "1"]);
+  bus.emit('removeMapDatas', [key + '1']);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == key)[0]
+    .filter(i => i.newfiberId == key)[0]
     .setData(geojson);
   busEmit(events_params.setGeoJSON.key, { json: geojson, 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],
@@ -631,44 +558,35 @@
 };
 
 let prevObj = null;
-const panelDataToMap = (obj) => {
-  let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件  默认触发
+const panelDataToMap = obj => {
+  let isUp = Object.keys(obj).includes('isUp') ? obj.isUp : true; //是否触发地图点击事件  默认触发
   // 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_psfq_geometrys",
-    "hb_wh_dhgx_merge",
-  ]
-    .map((key) =>
+  let features = ['point', 'linestring', 'polygon', 'hb_wh_dhgx_psfq_geometrys', '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.p_type)[0] ||
-    features.filter((i) => i.properties.name == obj.name)[0] ||
+    features.filter(i => i.properties.p_type)[0] ||
+    features.filter(i => i.properties.name == obj.name)[0] ||
     features[_.random(0, features.length - 1)];
-  console.log("feature.properties.p_type&&isUp", feature.properties.p_type && isUp);
-  if (feature.properties.p_type && isUp)
-    return mapClickEvt(undefined, feature.properties, "排水分区");
+  console.log('feature.properties.p_type&&isUp', feature.properties.p_type && isUp);
+  if (feature.properties.p_type && isUp) return mapClickEvt(undefined, feature.properties, '排水分区');
   if (!feature) return;
   busEmit(setHighlight.key, [feature]);
   mapCenterByData(turf.bbox(feature));
 };
 
-const mapCenterByData = (bbox) => {
+const mapCenterByData = bbox => {
   newfiberMap.map.fitBounds(
     [
       [bbox[0], bbox[1]],
@@ -677,29 +595,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 = () => {
@@ -712,55 +625,53 @@
   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 : '')
         ),
       others: {
         outlet_info: {
-          method: (data) =>
-            data.map((i) => ({ ...i, type: i.pointType + i.waterBodyId })),
+          method: data => data.map(i => ({ ...i, type: i.pointType + i.waterBodyId })),
         },
       },
     },
     //车辆
     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
         ),
     },
   };
   const other_data_params = {};
   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;
+    console.log('什么东西', k, keys[0]);
     if (k == keys[0]) appStore.SET_MapData(filterGeometryNotEmpty(data));
-    bus.emit("changeData");
+    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,
         })),
@@ -795,16 +706,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,
@@ -813,29 +724,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=f627fbb24176be73142eb0b5088d8683`
   );
-  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
           )
@@ -848,32 +754,32 @@
 const geoRegeo = async ({ name, lngLat, callback }) => {
   let flag,
     params = null;
-  if (name) (flag = "geo"), (params = `address=${name}`);
-  if (lngLat) (flag = "regeo"), (params = `location=${lngLat.join(",")}`);
-  if (!(flag || params)) console.log("name,lngLat is null!");
+  if (name) (flag = 'geo'), (params = `address=${name}`);
+  if (lngLat) (flag = 'regeo'), (params = `location=${lngLat.join(',')}`);
+  if (!(flag || params)) console.log('name,lngLat is null!');
   const results = await request(
     `/amap/v3/geocode/${flag}?${params}&extensions=all&output=json&key=f627fbb24176be73142eb0b5088d8683&city=420111`
   );
-  console.log("geoRegeo results", results);
+  console.log('geoRegeo results', results);
   callback && callback(results);
   return results;
 };
 
 //判断是否在打卡点内
 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
   );
 };
@@ -881,45 +787,43 @@
 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",
-    "clickPoint",
+    '问题管线',
+    '1_泵站',
+    '1_污水处理厂',
+    '1_调蓄池',
+    '分区流向',
+    '分区流向1',
+    'rainwater_pipeline_water_level',
+    'rainwater_pipeline_water_level_GWGSWYX',
+    'outlet_info1',
+    'temporary',
+    'highlight_linestring',
+    'highlight_polygon',
+    'highlight_point',
+    'clickPoint',
   ];
   clearRouteMethod();
-  const hideKeys = ["雨水系统流向", "雨水系统流向1", "排水分区_close"];
+  const hideKeys = ['雨水系统流向', '雨水系统流向1', '排水分区_close'];
   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;
-  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,
@@ -939,15 +843,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: {
@@ -967,29 +871,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,
@@ -998,29 +900,29 @@
   newfiberMap.addLayer(layer);
 };
 const events_params = {
-  removeMapDatas: { key: "removeMapDatas" },
-  setGeoJSON: { key: "setGeoJSON" },
-  setLayerVisible: { key: "setLayerVisible" },
-  beansToMap: { key: "beansToMap" },
-  closeAllLayer: { key: "closeAllLayer" },
-  setHighlight: { key: "setHighlight" },
-  geoRegeo: { key: "geoRegeo", method: geoRegeo },
-  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' },
+  geoRegeo: { key: 'geoRegeo', method: geoRegeo },
+  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 {
@@ -1030,10 +932,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/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index e910189..ad908cf 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -15,7 +15,7 @@
         <el-tab-pane label="资产" name="zhandian"></el-tab-pane>
         <el-tab-pane label="道路" name="daolu"></el-tab-pane>
       </el-tabs>
-      <el-option v-for="(item, index) in filterList" :key="item.id + index + item.id" :label="item.name" :value="item.geometry">
+      <el-option v-for="(item, index) in filterList" :key="item.pointTypeId" :label="item.name" :value="item.pointTypeId">
         <el-tooltip
           effect="dark"
           :content="item.name"
@@ -56,46 +56,47 @@
 const getItem = ref({});
 // 道路数据
 const roadData = ref([
-  {
-    data: [
-      {
-        id: 1,
-        name: '软件园中路',
-        geometry: '',
-        pointTypeName: '什么什么路',
-      },
-      {
-        id: 2,
-        name: '光谷大道',
-        geometry: '',
-        pointTypeName: '什么路',
-      },
-      {
-        id: 3,
-        name: '光谷大道1',
-        geometry: '',
-        pointTypeName: '什么路',
-      },
-      {
-        id: 4,
-        name: '光谷大道3',
-        geometry: '',
-        pointTypeName: '什么路',
-      },
-      {
-        id: 5,
-        name: '关山大道',
-        geometry: '',
-        pointTypeName: '1什么路',
-      },
-    ],
-  },
+  // {
+  //   data: [
+  //     {
+  //       id: 1,
+  //       name: '软件园中路',
+  //       geometry: '',
+  //       pointTypeName: '什么什么路',
+  //     },
+  //     {
+  //       id: 2,
+  //       name: '光谷大道',
+  //       geometry: '',
+  //       pointTypeName: '什么路',
+  //     },
+  //     {
+  //       id: 3,
+  //       name: '光谷大道1',
+  //       geometry: '',
+  //       pointTypeName: '什么路',
+  //     },
+  //     {
+  //       id: 4,
+  //       name: '光谷大道3',
+  //       geometry: '',
+  //       pointTypeName: '什么路',
+  //     },
+  //     {
+  //       id: 5,
+  //       name: '关山大道',
+  //       geometry: '',
+  //       pointTypeName: '1什么路',
+  //     },
+  //   ],
+  // },
 ]);
 watch(
   () => appStore.MapData,
   (newValue, oldValue) => {
     if (appStore.MapData && appStore.MapData.length) {
       if (number.value === 1) {
+        console.log('aaaa', appStore.MapData);
         GetSearchList(appStore.MapData);
         number.value = 4;
       }
@@ -110,63 +111,51 @@
   data.map(item => {
     SelectList.value = SelectList.value.concat(item.data);
   });
-  // console.log('MapData', appStore.MapData, SelectList.value);
+  console.log('MapData', appStore.MapData, SelectList.value);
   filterList.value = JSON.parse(JSON.stringify(SelectList.value));
   // debugger;
 }
 
 // 值改变后的操作
 function selectchange(value) {
-  console.log('valuevalue',value);
+  console.log('valuevalue', value);
   if (value) {
     let arr = SelectList.value.filter(item => {
-      return item.geometry == value;
+      return item.pointTypeId == value;
     });
+    console.log('arr', arr);
+
     if (arr && arr[0]) {
       getItem.value = arr[0];
     }
     selectmodel.value = getItem.value.name;
-    let feature = turf.feature(Terraformer.WKT.parse(value), _.cloneDeep(getItem.value));
-    console.log('feature',feature);
+    let feature = turf.feature(Terraformer.WKT.parse(getItem.value.geometry), _.cloneDeep(getItem.value));
+    console.log('feature', feature);
     bus.emit('setHighlight', feature);
     newfiberMap.map.easeTo({ center: turf.getCoords(turf.center(feature)), zoom: 15 });
     bus.emit('setGeoJSON', { json: turf.featureCollection([feature]), key: 'temporary' });
   }
-
-  /*  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);
-  }*/
 }
 const filterMethod = _.debounce(value => {
   if (value) {
     filterList.value = SelectList.value.filter(item => item.name.includes(value));
-      bus.emit('geoRegeo', {
-        name: value,
-        callback: results => {
-          if(!results.geocodes) return;
-          roadData.value = [
-            {
-              data:results.geocodes.map((i, idx) => ({
-                id: idx,
-                name: i.formatted_address,
-                geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
-                pointTypeName: '地理位置',
-              }))
-            }
-          ];
-          console.log('roadData.value',roadData.value);
-        },
-      });
+    bus.emit('geoRegeo', {
+      name: value,
+      callback: results => {
+        if (!results.geocodes) return;
+        roadData.value = [
+          {
+            data: results.geocodes.map((i, idx) => ({
+              id: idx,
+              name: i.formatted_address,
+              geometry: `POINT(${gcoord.transform(i.location.split(','), gcoord.AMap, gcoord.WGS84).join(' ')})`,
+              pointTypeName: '地理位置',
+            })),
+          },
+        ];
+        console.log('roadData.value', roadData.value);
+      },
+    });
   } else {
     filterList.value = SelectList.value;
   }
@@ -185,7 +174,7 @@
 };
 onMounted(() => {
   bus.on('YQ_head', val => {
-    console.log('appStore.MapData', appStore.MapData);
+    console.log('appStore.MapData', appStore.MapData, val);
     if (val == false) {
       Show.value = false;
     } else {
diff --git a/vite.config.js b/vite.config.js
index 83f81f4..1aff1b7 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -5,10 +5,10 @@
 import autoprefixer from 'autoprefixer';
 
 const Timestamp = new Date().getTime(); //随机时间戳
-let ipLink = 'https://server1.wh-nf.cn:8201/prod-api';
+// let ipLink = 'https://server1.wh-nf.cn:8201/prod-api';
 // let ipLink = 'http://192.168.16.135:9100';
-// let ipLink = 'http://192.168.16.124:9100';
-// let ipLink = 'http://192.168.20.43:9100'; // 刘总
+let ipLink = 'http://192.168.16.124:9100';
+// let ipLink = 'http://192.168.16.43:9100'; // 谢杨
 /*  */
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {
@@ -69,14 +69,14 @@
         '/prod-api/amap': {
           target: 'https://restapi.amap.com', //geocode服务
           changeOrigin: true,
-          rewrite: p => p.replace("/prod-api/amap", ''),
+          rewrite: p => p.replace('/prod-api/amap', ''),
         },
         '/prod-api/bdApi': {
           // target: 'http://192.168.16.34:8105/', //测试服务
           target: 'https://server2.wh-nf.cn:8088/prod-api/bdApi/', //测试服务
           changeOrigin: true,
           logLevel: 'debug',
-          rewrite: p => p.replace("/prod-api/bdApi", ''),
+          rewrite: p => p.replace('/prod-api/bdApi', ''),
         },
         '/prod-api': {
           target: ipLink,