diff --git a/src/utils/GISdocument/mapboxVectorLayer.js b/src/utils/GISdocument/mapboxVectorLayer.js
index ca28221..cb3b471 100644
--- a/src/utils/GISdocument/mapboxVectorLayer.js
+++ b/src/utils/GISdocument/mapboxVectorLayer.js
@@ -88,7 +88,7 @@
     }
   }
   //添加geojson Symbol
-  static addGeojsonSymbol(layerId, geojson, icon) {
+  static addGeojsonSymbol(layerId, geojson, icon, iconsize) {
     if (!newfiberMapbox.map.getLayer(layerId)) {
       newfiberMapbox.map.loadImage(icon, (error, image) => {
         if (error) throw error;
@@ -116,7 +116,7 @@
             'text-allow-overlap': true,
             'icon-allow-overlap': true,
             'icon-anchor': 'center',
-            'icon-size': 0.8,
+            'icon-size': iconsize ? iconsize : 0.8,
             'text-field': '{name}',
             'text-font': ['KlokanTech Noto Sans Regular'],
             'icon-rotate': ['get', 'bearing'],

diff --git a/src/utils/GISdocument/mapboxVectorLayer.js b/src/utils/GISdocument/mapboxVectorLayer.js
index ca28221..cb3b471 100644
--- a/src/utils/GISdocument/mapboxVectorLayer.js
+++ b/src/utils/GISdocument/mapboxVectorLayer.js
@@ -88,7 +88,7 @@
     }
   }
   //添加geojson Symbol
-  static addGeojsonSymbol(layerId, geojson, icon) {
+  static addGeojsonSymbol(layerId, geojson, icon, iconsize) {
     if (!newfiberMapbox.map.getLayer(layerId)) {
       newfiberMapbox.map.loadImage(icon, (error, image) => {
         if (error) throw error;
@@ -116,7 +116,7 @@
             'text-allow-overlap': true,
             'icon-allow-overlap': true,
             'icon-anchor': 'center',
-            'icon-size': 0.8,
+            'icon-size': iconsize ? iconsize : 0.8,
             'text-field': '{name}',
             'text-font': ['KlokanTech Noto Sans Regular'],
             'icon-rotate': ['get', 'bearing'],
diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue
index b3ce617..df1923e 100644
--- a/src/views/oneMap/components/mapboxPopup.vue
+++ b/src/views/oneMap/components/mapboxPopup.vue
@@ -492,7 +492,9 @@
     allData.dataList = params.popupInfo;
     let pipePopupDiv = document.getElementById('cesiumPopupID');
 
-    let popupCenter, center, offsets;
+    let popupCenter,
+      center,
+      offsets = null;
     if (allData.dataList.geometry) {
       if (allData.dataList.geometry.includes('LINESTRING')) {
         popupCenter = turf.center(turf.feature(Terraformer.WKT.parse(allData.dataList.geometry))).geometry.coordinates;
@@ -501,6 +503,9 @@
       }
       center = [popupCenter[0], popupCenter[1]];
       offsets = [-130, 200];
+    } else {
+      center = [params.point[0], params.point[1] + 0.0005];
+      offsets = [-30, 200];
     }
     if (allData.dataList.pumpCode) {
       allData.dataList.rainpump = JSON.parse(allData.dataList.rainpump);
@@ -514,7 +519,7 @@
         lat: popupCenter ? popupCenter[1] : params.point[1],
       },
       anchor: 'center',
-      offsets: [-90, 130],
+      offsets: offsets ? offsets : [-90, 130],
       autoClose: false,
     });
     newfiberMapbox.addPopup(pipePopup);
@@ -583,7 +588,7 @@
       color: #b8ecff;
       line-height: 22px;
       margin: 5px;
-      width: 330px;
+      width: 350px;
       padding-left: 25px;
       &:before {
         // display: block;

diff --git a/src/utils/GISdocument/mapboxVectorLayer.js b/src/utils/GISdocument/mapboxVectorLayer.js
index ca28221..cb3b471 100644
--- a/src/utils/GISdocument/mapboxVectorLayer.js
+++ b/src/utils/GISdocument/mapboxVectorLayer.js
@@ -88,7 +88,7 @@
     }
   }
   //添加geojson Symbol
-  static addGeojsonSymbol(layerId, geojson, icon) {
+  static addGeojsonSymbol(layerId, geojson, icon, iconsize) {
     if (!newfiberMapbox.map.getLayer(layerId)) {
       newfiberMapbox.map.loadImage(icon, (error, image) => {
         if (error) throw error;
@@ -116,7 +116,7 @@
             'text-allow-overlap': true,
             'icon-allow-overlap': true,
             'icon-anchor': 'center',
-            'icon-size': 0.8,
+            'icon-size': iconsize ? iconsize : 0.8,
             'text-field': '{name}',
             'text-font': ['KlokanTech Noto Sans Regular'],
             'icon-rotate': ['get', 'bearing'],
diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue
index b3ce617..df1923e 100644
--- a/src/views/oneMap/components/mapboxPopup.vue
+++ b/src/views/oneMap/components/mapboxPopup.vue
@@ -492,7 +492,9 @@
     allData.dataList = params.popupInfo;
     let pipePopupDiv = document.getElementById('cesiumPopupID');
 
-    let popupCenter, center, offsets;
+    let popupCenter,
+      center,
+      offsets = null;
     if (allData.dataList.geometry) {
       if (allData.dataList.geometry.includes('LINESTRING')) {
         popupCenter = turf.center(turf.feature(Terraformer.WKT.parse(allData.dataList.geometry))).geometry.coordinates;
@@ -501,6 +503,9 @@
       }
       center = [popupCenter[0], popupCenter[1]];
       offsets = [-130, 200];
+    } else {
+      center = [params.point[0], params.point[1] + 0.0005];
+      offsets = [-30, 200];
     }
     if (allData.dataList.pumpCode) {
       allData.dataList.rainpump = JSON.parse(allData.dataList.rainpump);
@@ -514,7 +519,7 @@
         lat: popupCenter ? popupCenter[1] : params.point[1],
       },
       anchor: 'center',
-      offsets: [-90, 130],
+      offsets: offsets ? offsets : [-90, 130],
       autoClose: false,
     });
     newfiberMapbox.addPopup(pipePopup);
@@ -583,7 +588,7 @@
       color: #b8ecff;
       line-height: 22px;
       margin: 5px;
-      width: 330px;
+      width: 350px;
       padding-left: 25px;
       &:before {
         // display: block;
diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue
index f738339..23d921f 100644
--- a/src/views/oneMap/index.vue
+++ b/src/views/oneMap/index.vue
@@ -5,20 +5,14 @@
       <!-- 顶部 -->
       <div
         id="oneMapHeader"
-        :class="[
-          'oneMapHeader',
-          'animate__animated',
-          showPanel2 ? 'animate__fadeOutUp' : 'animate__fadeInDown',
-        ]"
+        :class="['oneMapHeader', 'animate__animated', showPanel2 ? 'animate__fadeOutUp' : 'animate__fadeInDown']"
       >
         <!-- 标题 -->
         <!-- <img id="titleFont" src="@/assets/images/Sponge_screen/oneMapTitleFont.png" /> -->
         <div id="titleFont">延安市城市生命线安全运行监测系统</div>
         <!-- 标题左侧展示组件 -->
         <div class="Location">
-          <el-icon size="18" style="margin-right: 5px; vertical-align: bottom"
-            ><LocationFilled
-          /></el-icon>
+          <el-icon size="18" style="margin-right: 5px; vertical-align: bottom"><LocationFilled /></el-icon>
           延安
         </div>
         <div class="Timer">
@@ -39,9 +33,7 @@
       <!-- 地图组件 -->
       <OneMap @map-click="mapClick" v-if="AllData.MapShowBol"></OneMap>
       <!-- 桥梁BIM -->
-      <WangJiaPingBIM
-        v-if="!AllData.MapShowBol && AllData.ComShowID == 4"
-      ></WangJiaPingBIM>
+      <WangJiaPingBIM v-if="!AllData.MapShowBol && AllData.ComShowID == 4"></WangJiaPingBIM>
       <!-- 隧道BIM -->
       <Tunnel v-if="!AllData.MapShowBol && AllData.ComShowID == 5"></Tunnel>
       <!-- 降雨效果 -->
@@ -69,48 +61,19 @@
         :class="[showPanel ? 'TuChengImgTrue' : 'TuChengImgFalse']"
         v-if="AllData.MapShowBol"
       />
-      <LayerControl
-        v-if="AllData.MapShowBol"
-        :ShowTuCheng="ShowTuCheng"
-        :showPanel="showPanel"
-      ></LayerControl>
+      <LayerControl v-if="AllData.MapShowBol" :ShowTuCheng="ShowTuCheng" :showPanel="showPanel"></LayerControl>
       <!-- 1:总体概览 -->
-      <ComZTGL
-        v-if="AllData.ComShowID == 1"
-        :isActive="AllData.ComShowID == 1 ? true : false"
-        :showPanel="showPanel"
-      ></ComZTGL>
+      <ComZTGL v-if="AllData.ComShowID == 1" :isActive="AllData.ComShowID == 1 ? true : false" :showPanel="showPanel"></ComZTGL>
       <!-- 2:智慧燃气 -->
-      <ComZHRQ
-        v-if="AllData.ComShowID == 2"
-        :isActive="AllData.ComShowID == 2 ? true : false"
-        :showPanel="showPanel"
-      ></ComZHRQ>
+      <ComZHRQ v-if="AllData.ComShowID == 2" :isActive="AllData.ComShowID == 2 ? true : false" :showPanel="showPanel"></ComZHRQ>
       <!-- 3:智慧排水 -->
-      <ComZHPS
-        v-if="AllData.ComShowID == 3"
-        :isActive="AllData.ComShowID == 3 ? true : false"
-        :showPanel="showPanel"
-      ></ComZHPS>
+      <ComZHPS v-if="AllData.ComShowID == 3" :isActive="AllData.ComShowID == 3 ? true : false" :showPanel="showPanel"></ComZHPS>
       <!-- 4:智慧桥梁 -->
-      <ComZHQL
-        v-if="AllData.ComShowID == 4"
-        :isActive="AllData.ComShowID == 4 ? true : false"
-        :showPanel="showPanel"
-      >
-      </ComZHQL>
+      <ComZHQL v-if="AllData.ComShowID == 4" :isActive="AllData.ComShowID == 4 ? true : false" :showPanel="showPanel"> </ComZHQL>
       <!-- 5:智慧隧道 -->
-      <ComZHSD
-        v-if="AllData.ComShowID == 5"
-        :isActive="AllData.ComShowID == 5 ? true : false"
-        :showPanel="showPanel"
-      ></ComZHSD>
+      <ComZHSD v-if="AllData.ComShowID == 5" :isActive="AllData.ComShowID == 5 ? true : false" :showPanel="showPanel"></ComZHSD>
       <!-- 6:智慧海绵 -->
-      <ComZHHM
-        v-if="AllData.ComShowID == 6"
-        :isActive="AllData.ComShowID == 6 ? true : false"
-        :showPanel="showPanel"
-      ></ComZHHM>
+      <ComZHHM v-if="AllData.ComShowID == 6" :isActive="AllData.ComShowID == 6 ? true : false" :showPanel="showPanel"></ComZHHM>
       <!-- 智慧海绵-监测分析 -->
       <ZHHMJCFX
         v-if="AllData.ComShowID == 61"
@@ -124,11 +87,7 @@
         :showPanel="showPanel"
       ></ZHHMJSPG>
       <!-- 7:防洪排涝 -->
-      <ComFHPL
-        v-if="AllData.ComShowID == 7"
-        :isActive="AllData.ComShowID == 7 ? true : false"
-        :showPanel="showPanel"
-      ></ComFHPL>
+      <ComFHPL v-if="AllData.ComShowID == 7" :isActive="AllData.ComShowID == 7 ? true : false" :showPanel="showPanel"></ComFHPL>
     </div>
     <!-- 底部菜单 -->
     <div id="BottomMenuBox">
@@ -138,11 +97,7 @@
       <!-- 菜单List -->
       <div
         class="MenuList"
-        :class="[
-          'MenuList' + index,
-          'animate__animated',
-          showPanel2 ? 'animate__bounceInUp' : 'animate__bounceInUp',
-        ]"
+        :class="['MenuList' + index, 'animate__animated', showPanel2 ? 'animate__bounceInUp' : 'animate__bounceInUp']"
         v-for="(item, index) in AllData.MenuListData"
         @click="MenuClick(item, index)"
         v-if="BottomshowPanel"
@@ -156,10 +111,7 @@
 
           <!-- 二级菜单 -->
           <!-- <Transition name="slide-fade2"> -->
-          <div
-            v-show="AllData.ErJiMenuShowID == item.id && !!item.children"
-            class="ErJiMenuBox"
-          >
+          <div v-show="AllData.ErJiMenuShowID == item.id && !!item.children" class="ErJiMenuBox">
             <span
               class="ErJiMenuList"
               :class="AllData.ErJiMenuCheckID == item2.id ? 'ErJiMenuCheck' : ''"
@@ -178,11 +130,7 @@
     <Voice></Voice>
   </div>
   <!-- 融云弹窗 -->
-  <ModelRongYun
-    :RYdialogShow="AllData.RYDialog"
-    :ZhuDongBoHao="AllData.ZhuDongBoHao"
-    @OneDialogHide="dialogHide"
-  ></ModelRongYun>
+  <ModelRongYun :RYdialogShow="AllData.RYDialog" :ZhuDongBoHao="AllData.ZhuDongBoHao" @OneDialogHide="dialogHide"></ModelRongYun>
   <!-- 前端组件公共弹窗 -->
   <el-dialog
     modal-class="publicDialogVisible"
@@ -204,60 +152,62 @@
 </template>
 
 <script setup name="oneMapIndex">
-import bus from "@/bus";
-import request from "@/utils/request";
-import { fullscreenToggel } from "@/utils/util";
-import { ref, reactive, toRefs, onMounted } from "vue";
+import bus from '@/bus';
+import request from '@/utils/request';
+import { fullscreenToggel } from '@/utils/util';
+import { ref, reactive, toRefs, onMounted } from 'vue';
 
-import useUserStore from "@/store/modules/user";
+import useUserStore from '@/store/modules/user';
 const userStore = useUserStore();
 // 菜单的图片资源
-import ZTGL from "@/assets/images/Sponge_screen/menu/ZTGL.png";
-import AC_ZTGL from "@/assets/images/Sponge_screen/menu/AC_ZTGL.png";
-import ZHRQ from "@/assets/images/Sponge_screen/menu/ZHRQ.png";
-import AC_ZHRQ from "@/assets/images/Sponge_screen/menu/AC_ZHRQ.png";
-import ZHPS from "@/assets/images/Sponge_screen/menu/ZHPS.png";
-import AC_ZHPS from "@/assets/images/Sponge_screen/menu/AC_ZHPS.png";
-import ZHQL from "@/assets/images/Sponge_screen/menu/ZHQL.png";
-import AC_ZHQL from "@/assets/images/Sponge_screen/menu/AC_ZHQL.png";
-import ZHSD from "@/assets/images/Sponge_screen/menu/ZHSD.png";
-import AC_ZHSD from "@/assets/images/Sponge_screen/menu/AC_ZHSD.png";
-import FXPL from "@/assets/images/Sponge_screen/menu/FXPL.png";
-import AC_FXPL from "@/assets/images/Sponge_screen/menu/AC_FXPL.png";
-import ZHHM from "@/assets/images/Sponge_screen/menu/ZHHM.png";
-import AC_ZHHM from "@/assets/images/Sponge_screen/menu/AC_ZHHM.png";
+import ZTGL from '@/assets/images/Sponge_screen/menu/ZTGL.png';
+import AC_ZTGL from '@/assets/images/Sponge_screen/menu/AC_ZTGL.png';
+import ZHRQ from '@/assets/images/Sponge_screen/menu/ZHRQ.png';
+import AC_ZHRQ from '@/assets/images/Sponge_screen/menu/AC_ZHRQ.png';
+import ZHPS from '@/assets/images/Sponge_screen/menu/ZHPS.png';
+import AC_ZHPS from '@/assets/images/Sponge_screen/menu/AC_ZHPS.png';
+import ZHQL from '@/assets/images/Sponge_screen/menu/ZHQL.png';
+import AC_ZHQL from '@/assets/images/Sponge_screen/menu/AC_ZHQL.png';
+import ZHSD from '@/assets/images/Sponge_screen/menu/ZHSD.png';
+import AC_ZHSD from '@/assets/images/Sponge_screen/menu/AC_ZHSD.png';
+import FXPL from '@/assets/images/Sponge_screen/menu/FXPL.png';
+import AC_FXPL from '@/assets/images/Sponge_screen/menu/AC_FXPL.png';
+import ZHHM from '@/assets/images/Sponge_screen/menu/ZHHM.png';
+import AC_ZHHM from '@/assets/images/Sponge_screen/menu/AC_ZHHM.png';
 // 引用地图
-import OneMap from "./map/newfiberMapBox.vue";
+import OneMap from './map/newfiberMapBox.vue';
 
 // 引用王家坪大桥BIm
-import WangJiaPingBIM from "./BIM/WangJiaPIng.vue";
+import WangJiaPingBIM from './BIM/WangJiaPIng.vue';
 // 引用隧道BIm
-import Tunnel from "./BIM/Tunnel.vue";
+import Tunnel from './BIM/Tunnel.vue';
 // 引用语音识别
-import Voice from "./../voice/recordPage/index.vue";
+import Voice from './../voice/recordPage/index.vue';
 // 引入融云通讯录
-import ModelRongYun from "@/views/RongyunCommunication/ModelRongYun/index.vue"; //融云调用
+import ModelRongYun from '@/views/RongyunCommunication/ModelRongYun/index.vue'; //融云调用
 // 子系统引入
-import ComZTGL from "./components/ZTGL.vue"; //总体概览
-import ComZHRQ from "./components/ZHRQ.vue"; //智慧燃气
-import ComZHPS from "./components/ZHPS.vue"; //智慧排水
-import ComZHQL from "./components/ZHQL.vue"; //智慧桥梁
-import ComZHSD from "./components/ZHSD.vue"; //智慧隧道
-import ComZHHM from "./components/ZHHM.vue"; //智慧海绵
-import ComFHPL from "./components/FHPL.vue"; //防洪排涝
-import ZHHMJCFX from "./components/ZHHM_JCFX.vue"; //智慧海绵-监测分析
-import ZHHMJSPG from "./components/ZHHM_JSPG.vue"; //智慧海绵-建设评估
-import PopupInfo from "@/views/oneMap/components/mapboxPopup.vue"; //地图标注点弹窗
-import dynamicInformation from "@/views/oneMap/components/dynamicInformation.vue"; //地图标注点弹窗
+import ComZTGL from './components/ZTGL.vue'; //总体概览
+import ComZHRQ from './components/ZHRQ.vue'; //智慧燃气
+import ComZHPS from './components/ZHPS.vue'; //智慧排水
+import ComZHQL from './components/ZHQL.vue'; //智慧桥梁
+import ComZHSD from './components/ZHSD.vue'; //智慧隧道
+import ComZHHM from './components/ZHHM.vue'; //智慧海绵
+import ComFHPL from './components/FHPL.vue'; //防洪排涝
+import ZHHMJCFX from './components/ZHHM_JCFX.vue'; //智慧海绵-监测分析
+import ZHHMJSPG from './components/ZHHM_JSPG.vue'; //智慧海绵-建设评估
+import PopupInfo from '@/views/oneMap/components/mapboxPopup.vue'; //地图标注点弹窗
+import dynamicInformation from '@/views/oneMap/components/dynamicInformation.vue'; //地图标注点弹窗
 // 降雨效果
-import CanvasRain from "@/views/oneMap/cityGK/canvasRain.vue"; //降雨效果
+import CanvasRain from '@/views/oneMap/cityGK/canvasRain.vue'; //降雨效果
 // 图层控制面板
-import LayerControl from "@/views/oneMap/LayerControl/LayerControl.vue"; //图层控制面板
+import LayerControl from '@/views/oneMap/LayerControl/LayerControl.vue'; //图层控制面板
 // 前端共同弹窗
-import DialogTabs from "@/views/DialogTabs/dialogTabs.vue";
+import DialogTabs from '@/views/DialogTabs/dialogTabs.vue';
 // 左右滑动
-import ZuoYou1 from "@/assets/images/Sponge_screen/ZuoYou1.png";
-import ZuoYou2 from "@/assets/images/Sponge_screen/ZuoYou2.png";
+import ZuoYou1 from '@/assets/images/Sponge_screen/ZuoYou1.png';
+import ZuoYou2 from '@/assets/images/Sponge_screen/ZuoYou2.png';
+import xtb_img from '@/assets/newImgs/xtb_img.png';
+import mapBoxVectorLayer from '@/utils/GISdocument/mapboxVectorLayer.js';
 // 时间以及天气
 const timer = ref(null);
 const dates = ref(null);
@@ -265,8 +215,8 @@
 const times = ref(null);
 const weather = ref({
   temperature: null,
-  imgNum: "",
-  text: "",
+  imgNum: '',
+  text: '',
 });
 const showPanel = ref(false);
 const showPanel2 = ref(false);
@@ -354,61 +304,61 @@
 // 公共弹窗
 const dialogConfig = reactive({
   visible: false,
-  getSiteId: "",
-  SiteNo: "",
+  getSiteId: '',
+  SiteNo: '',
   data: {},
-  comIDs: ["spjk"],
+  comIDs: ['spjk'],
   customData: [],
-  RefName: "",
-  title: "详情",
+  RefName: '',
+  title: '详情',
 });
 onBeforeMount(() => {
-  console.log("ZhuanTiType", userStore.ZhuanTiType);
+  console.log('ZhuanTiType', userStore.ZhuanTiType);
   if (userStore.ZhuanTiType == 1) {
     // 城市生命线
     AllData.MenuListData = [
       {
-        name: "总体概览",
+        name: '总体概览',
         iocn: ZTGL,
         AC_icon: AC_ZTGL,
         id: 1,
-        Layers: ["路网", "河流水系"],
+        Layers: ['路网', '河流水系'],
       },
       {
-        name: "燃气安全",
+        name: '燃气安全',
         iocn: ZHRQ,
         AC_icon: AC_ZHRQ,
         id: 2,
-        Layers: ["干管", "主管", "干管流向", "主管流向"],
+        Layers: ['干管', '主管', '干管流向', '主管流向'],
       },
       {
-        name: "排水安全",
+        name: '排水安全',
         iocn: ZHPS,
         AC_icon: AC_ZHPS,
         id: 3,
-        Layers: ["雨水管网", "污水管网"],
+        Layers: ['雨水管网', '污水管网'],
         children: [
           {
-            name: "排水安全",
+            name: '排水安全',
             id: 3,
             Layers: [],
           },
           {
-            name: "防汛排涝",
+            name: '防汛排涝',
             id: 7,
             Layers: [],
           },
         ],
       },
       {
-        name: "桥梁安全",
+        name: '桥梁安全',
         iocn: ZHQL,
         AC_icon: AC_ZHQL,
         id: 4,
         Layers: [],
       },
       {
-        name: "隧道安全",
+        name: '隧道安全',
         iocn: ZHSD,
         AC_icon: AC_ZHSD,
         id: 5,
@@ -419,19 +369,19 @@
     // 海绵
     AllData.MenuListData = [
       {
-        name: "城市概览",
+        name: '城市概览',
         iocn: ZHHM,
         AC_icon: AC_ZHHM,
         id: 6,
       },
       {
-        name: "监测分析",
+        name: '监测分析',
         iocn: ZHHM,
         AC_icon: AC_ZHHM,
         id: 61,
       },
       {
-        name: "建设评估",
+        name: '建设评估',
         iocn: ZHHM,
         AC_icon: AC_ZHHM,
         id: 62,
@@ -445,10 +395,10 @@
 onMounted(() => {
   fullscreenToggel();
   AllData.BottmBackGroundShow = true;
-  console.log(AllData.BottmBackGroundShow, "AllData.BottmBackGroundShow");
-  bus.emit("BottomHidden", AllData.BottmBackGroundShow);
+  console.log(AllData.BottmBackGroundShow, 'AllData.BottmBackGroundShow');
+  bus.emit('BottomHidden', AllData.BottmBackGroundShow);
   // 降雨特征点击
-  bus.on("checkRainL", (params) => {
+  bus.on('checkRainL', params => {
     if (params == 1) {
       showRainFlow.value = false;
     } else {
@@ -456,7 +406,7 @@
     }
   });
   // 底部隐藏
-  bus.on("checkBottom", (params) => {
+  bus.on('checkBottom', params => {
     if (params == 1) {
       BottomshowPanel.value = false;
     } else {
@@ -464,15 +414,15 @@
     }
   });
   // 共同弹窗触发事件
-  bus.on("publicDialog", (params) => {
+  bus.on('publicDialog', params => {
     dialogConfig.getSiteId = params.getSiteId;
-    dialogConfig.title = params.title ?? "详情";
+    dialogConfig.title = params.title ?? '详情';
     dialogConfig.comIDs = params.comIDs ?? dialogConfig.comIDs;
     // 打开弹窗
     dialogConfig.visible = true;
   });
   // 共同弹窗触发事件
-  bus.on("publicDialog_Close", (params) => {
+  bus.on('publicDialog_Close', params => {
     // 打开弹窗
     dialogConfig.visible = false;
   });
@@ -482,14 +432,14 @@
   currentTime();
   //initRainImage();
   // 打开融云通讯录主动拨号
-  bus.on("OpenRY", (params) => {
+  bus.on('OpenRY', params => {
     AllData.ZhuDongBoHao = true;
     AllData.RYDialog = true;
-    bus.emit("showRy");
+    bus.emit('showRy');
   });
 
   // 切换专题图
-  bus.on("ChangeZhuanTiTu", (params) => {
+  bus.on('ChangeZhuanTiTu', params => {
     if (params.num == 1) {
       // 一级
       MenuClick(params.MenuData1);
@@ -499,18 +449,18 @@
     }
   });
   // 切换面板显示隐藏
-  bus.on("changeShowPanel", (params) => {
+  bus.on('changeShowPanel', params => {
     showPanel.value = params;
   });
 });
 onBeforeUnmount(() => {
-  bus.off("BottomHidden");
-  bus.off("publicDialog");
-  bus.off("publicDialog_Close");
-  bus.off("OpenRY");
-  bus.off("ChangeZhuanTiTu");
-  bus.off("checkRainL");
-  bus.off("changeShowPanel");
+  bus.off('BottomHidden');
+  bus.off('publicDialog');
+  bus.off('publicDialog_Close');
+  bus.off('OpenRY');
+  bus.off('ChangeZhuanTiTu');
+  bus.off('checkRainL');
+  bus.off('changeShowPanel');
 });
 // 菜单点击
 const MenuClick = (item, index) => {
@@ -529,9 +479,9 @@
   } else {
     AllData.MapShowBol = true;
     // 点击菜单时隐藏所有图层
-    bus.emit("clearAllLayer");
+    bus.emit('clearAllLayer');
     // 打开默认的菜单
-    bus.emit("SetLayerShow", item.Layers);
+    bus.emit('SetLayerShow', item.Layers);
   }
 };
 // 二级菜单点击
@@ -550,10 +500,10 @@
 const toRYBox = () => {
   AllData.RYDialog = true;
   AllData.ZhuDongBoHao = false;
-  bus.emit("showRy");
+  bus.emit('showRy');
 };
 // 关闭融云通讯录弹窗
-const dialogHide = (val) => {
+const dialogHide = val => {
   if (!val) {
     AllData.RYDialog = false;
     AllData.ZhuDongBoHao = false;
@@ -561,19 +511,20 @@
 };
 //地图点击事件
 const mapClick = async (point, properties, feature) => {
-  console.log("point", point);
-  console.log("properties", properties);
-  console.log("feature---", feature);
+  console.log('point', point);
+  console.log('properties', properties);
+  console.log('feature---', feature);
   if (!feature) {
     let currentZoom = newfiberMapbox.map.getZoom();
-    console.log("currentZoom--", currentZoom);
-    if (currentZoom >= 17) {
+    console.log('currentZoom--', currentZoom);
+    if (currentZoom >= 18) {
       let clickPoint = turf.point(point);
+      let positionAddress = '';
       gcoord.transform(clickPoint, gcoord.WGS84, gcoord.BD09);
-      console.log("clickPoint---", clickPoint, clickPoint.geometry.coordinates);
+      console.log('clickPoint---', clickPoint, clickPoint.geometry.coordinates);
       let data = await request({
         url: `/bdApi//baiduservice/panorama`,
-        method: "GET",
+        method: 'GET',
         params: {
           location: `${clickPoint.geometry.coordinates[0]},${clickPoint.geometry.coordinates[1]}`,
           fov: 180,
@@ -582,11 +533,31 @@
         },
       });
       if (data && data.data) {
-        data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
+        data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64;
       }
-      console.log("data----", data);
+      console.log('data----', data);
       gcoord.transform(clickPoint, gcoord.BD09, gcoord.WGS84);
-      bus.emit("popupcontent", {
+      gcoord.transform(clickPoint, gcoord.WGS84, gcoord.GCJ02);
+      let regeodata = await request({
+        url: `/amap/v3/geocode/regeo`,
+        method: 'GET',
+        params: {
+          location: `${clickPoint.geometry.coordinates[0]},${clickPoint.geometry.coordinates[1]}`,
+          key: '76eac14980622704ba95c1bf080f3b4c',
+          radius: 1000,
+          extensions: 'all',
+          output: 'json',
+        },
+      });
+      if (regeodata.info === 'OK') {
+        console.log('坐标返地名data----', data);
+        positionAddress = regeodata.regeocode.formatted_address;
+      }
+      gcoord.transform(clickPoint, gcoord.GCJ02, gcoord.WGS84);
+      mapBoxVectorLayer.removeByIds(['clickPoint']);
+      mapBoxVectorLayer.addGeojsonSymbol('clickPoint', turf.featureCollection([clickPoint]), xtb_img, 2);
+      data.roadName = positionAddress;
+      bus.emit('popupcontent', {
         popupShow: true,
         point: point,
         popupInfo: data,
@@ -594,21 +565,19 @@
     }
   }
   if (properties) {
-    if (feature == "rq_pipeline_info") {
-      if (!!newfiberMapbox.getLayerByName("rqLine")) {
-        newfiberMapbox.removeLayer(newfiberMapbox.getLayerByName("rqLine"));
+    if (feature == 'rq_pipeline_info') {
+      if (!!newfiberMapbox.getLayerByName('rqLine')) {
+        newfiberMapbox.removeLayer(newfiberMapbox.getLayerByName('rqLine'));
       }
-      let rqLine = turf.featureCollection([
-        turf.feature(Terraformer.WKT.parse(properties.geometry)),
-      ]);
+      let rqLine = turf.featureCollection([turf.feature(Terraformer.WKT.parse(properties.geometry))]);
       let layer = new mapboxL7.LineLayer({
-        name: "rqLine",
+        name: 'rqLine',
       })
         .source(rqLine)
         .size(4)
-        .shape("line")
-        .texture("arrow")
-        .color("rgb(241, 159, 27)")
+        .shape('line')
+        .texture('arrow')
+        .color('rgb(241, 159, 27)')
         .animate({
           interval: 2, // 间隔
           duration: 2, // 持续时间，延时
@@ -619,11 +588,11 @@
           lineTexture: true, // 开启线的贴图功能
           iconStep: 50, // 设置贴图纹理的间距
           borderWidth: 0, // 默认文 0，最大有效值为 0.5
-          borderColor: "#fff", // 默认为 #ccc
+          borderColor: '#fff', // 默认为 #ccc
         });
       newfiberMapbox.addLayer(layer);
     }
-    bus.emit("popupcontent", {
+    bus.emit('popupcontent', {
       popupShow: true,
       point: point,
       popupInfo: properties,
@@ -638,20 +607,12 @@
   let month = date.getMonth() + 1; // 月
   let day = date.getDate(); // 日
   let hour = date.getHours(); // 时
-  hour = hour < 10 ? "0" + hour : hour; // 如果只有一位，则前面补零
+  hour = hour < 10 ? '0' + hour : hour; // 如果只有一位，则前面补零
   let minute = date.getMinutes(); // 分
-  minute = minute < 10 ? "0" + minute : minute; // 如果只有一位，则前面补零
+  minute = minute < 10 ? '0' + minute : minute; // 如果只有一位，则前面补零
   let second = date.getSeconds(); // 秒
-  second = second < 10 ? "0" + second : second; // 如果只有一位，则前面补零
-  let weekAry = new Array(
-    "星期日",
-    "星期一",
-    "星期二",
-    "星期三",
-    "星期四",
-    "星期五",
-    "星期六"
-  );
+  second = second < 10 ? '0' + second : second; // 如果只有一位，则前面补零
+  let weekAry = new Array('星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六');
   weeks.value = weekAry[date.getDay()];
   dates.value = `${year}-${month}-${day}`;
   times.value = `${hour}:${minute}:${second}`;
@@ -674,11 +635,11 @@
   // }
 };
 // 二级菜单展示
-const handleMouseEnter = (item) => {
+const handleMouseEnter = item => {
   AllData.ErJiMenuShowID = item.id;
 };
 // 二级菜单展示
-const handleMouseLeave = (item) => {
+const handleMouseLeave = item => {
   AllData.ErJiMenuShowID = null;
 };
 </script>
@@ -701,7 +662,7 @@
     #oneMapHeader {
       width: 100%;
       height: 100px;
-      background: url("@/assets/images/Sponge_screen/db_img.png") no-repeat center;
+      background: url('@/assets/images/Sponge_screen/db_img.png') no-repeat center;
       background-size: cover;
       z-index: 100;
       position: absolute;
@@ -785,17 +746,17 @@
         cursor: pointer;
       }
       .goHome {
-        background: url("@/assets/images/Sponge_screen/gb_btn.png") no-repeat center;
+        background: url('@/assets/images/Sponge_screen/gb_btn.png') no-repeat center;
         background-size: contain;
         right: 150px;
       }
       .goUser_com {
-        background: url("@/assets/images/Sponge_screen/hs_btn.png") no-repeat center;
+        background: url('@/assets/images/Sponge_screen/hs_btn.png') no-repeat center;
         background-size: contain;
         right: 100px;
       }
       .goClose_com {
-        background: url("@/assets/images/Sponge_screen/sy_btn.png") no-repeat center;
+        background: url('@/assets/images/Sponge_screen/sy_btn.png') no-repeat center;
         background-size: contain;
         right: 50px;
       }
@@ -850,7 +811,7 @@
       bottom: 0;
       width: 952px;
       height: 62px;
-      background: url("@/assets/images/Sponge_screen/menu/DB_img.png") no-repeat center;
+      background: url('@/assets/images/Sponge_screen/menu/DB_img.png') no-repeat center;
       background-size: cover;
     }
     // 图标菜单样式 从左到右按照顺序进行设定
@@ -984,7 +945,7 @@
     height: 800px;
     border: 1px solid #15d2fd;
     .el-dialog__header {
-      background: url("@/assets/images/Sponge_screen/DialogTitleBG.png") no-repeat center;
+      background: url('@/assets/images/Sponge_screen/DialogTitleBG.png') no-repeat center;
       background-size: cover;
       padding: 0;
       height: 60px;

diff --git a/src/utils/GISdocument/mapboxVectorLayer.js b/src/utils/GISdocument/mapboxVectorLayer.js
index ca28221..cb3b471 100644
--- a/src/utils/GISdocument/mapboxVectorLayer.js
+++ b/src/utils/GISdocument/mapboxVectorLayer.js
@@ -88,7 +88,7 @@
     }
   }
   //添加geojson Symbol
-  static addGeojsonSymbol(layerId, geojson, icon) {
+  static addGeojsonSymbol(layerId, geojson, icon, iconsize) {
     if (!newfiberMapbox.map.getLayer(layerId)) {
       newfiberMapbox.map.loadImage(icon, (error, image) => {
         if (error) throw error;
@@ -116,7 +116,7 @@
             'text-allow-overlap': true,
             'icon-allow-overlap': true,
             'icon-anchor': 'center',
-            'icon-size': 0.8,
+            'icon-size': iconsize ? iconsize : 0.8,
             'text-field': '{name}',
             'text-font': ['KlokanTech Noto Sans Regular'],
             'icon-rotate': ['get', 'bearing'],
diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue
index b3ce617..df1923e 100644
--- a/src/views/oneMap/components/mapboxPopup.vue
+++ b/src/views/oneMap/components/mapboxPopup.vue
@@ -492,7 +492,9 @@
     allData.dataList = params.popupInfo;
     let pipePopupDiv = document.getElementById('cesiumPopupID');
 
-    let popupCenter, center, offsets;
+    let popupCenter,
+      center,
+      offsets = null;
     if (allData.dataList.geometry) {
       if (allData.dataList.geometry.includes('LINESTRING')) {
         popupCenter = turf.center(turf.feature(Terraformer.WKT.parse(allData.dataList.geometry))).geometry.coordinates;
@@ -501,6 +503,9 @@
       }
       center = [popupCenter[0], popupCenter[1]];
       offsets = [-130, 200];
+    } else {
+      center = [params.point[0], params.point[1] + 0.0005];
+      offsets = [-30, 200];
     }
     if (allData.dataList.pumpCode) {
       allData.dataList.rainpump = JSON.parse(allData.dataList.rainpump);
@@ -514,7 +519,7 @@
         lat: popupCenter ? popupCenter[1] : params.point[1],
       },
       anchor: 'center',
-      offsets: [-90, 130],
+      offsets: offsets ? offsets : [-90, 130],
       autoClose: false,
     });
     newfiberMapbox.addPopup(pipePopup);
@@ -583,7 +588,7 @@
       color: #b8ecff;
       line-height: 22px;
       margin: 5px;
-      width: 330px;
+      width: 350px;
       padding-left: 25px;
       &:before {
         // display: block;
diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue
index f738339..23d921f 100644
--- a/src/views/oneMap/index.vue
+++ b/src/views/oneMap/index.vue
@@ -5,20 +5,14 @@
       <!-- 顶部 -->
       <div
         id="oneMapHeader"
-        :class="[
-          'oneMapHeader',
-          'animate__animated',
-          showPanel2 ? 'animate__fadeOutUp' : 'animate__fadeInDown',
-        ]"
+        :class="['oneMapHeader', 'animate__animated', showPanel2 ? 'animate__fadeOutUp' : 'animate__fadeInDown']"
       >
         <!-- 标题 -->
         <!-- <img id="titleFont" src="@/assets/images/Sponge_screen/oneMapTitleFont.png" /> -->
         <div id="titleFont">延安市城市生命线安全运行监测系统</div>
         <!-- 标题左侧展示组件 -->
         <div class="Location">
-          <el-icon size="18" style="margin-right: 5px; vertical-align: bottom"
-            ><LocationFilled
-          /></el-icon>
+          <el-icon size="18" style="margin-right: 5px; vertical-align: bottom"><LocationFilled /></el-icon>
           延安
         </div>
         <div class="Timer">
@@ -39,9 +33,7 @@
       <!-- 地图组件 -->
       <OneMap @map-click="mapClick" v-if="AllData.MapShowBol"></OneMap>
       <!-- 桥梁BIM -->
-      <WangJiaPingBIM
-        v-if="!AllData.MapShowBol && AllData.ComShowID == 4"
-      ></WangJiaPingBIM>
+      <WangJiaPingBIM v-if="!AllData.MapShowBol && AllData.ComShowID == 4"></WangJiaPingBIM>
       <!-- 隧道BIM -->
       <Tunnel v-if="!AllData.MapShowBol && AllData.ComShowID == 5"></Tunnel>
       <!-- 降雨效果 -->
@@ -69,48 +61,19 @@
         :class="[showPanel ? 'TuChengImgTrue' : 'TuChengImgFalse']"
         v-if="AllData.MapShowBol"
       />
-      <LayerControl
-        v-if="AllData.MapShowBol"
-        :ShowTuCheng="ShowTuCheng"
-        :showPanel="showPanel"
-      ></LayerControl>
+      <LayerControl v-if="AllData.MapShowBol" :ShowTuCheng="ShowTuCheng" :showPanel="showPanel"></LayerControl>
       <!-- 1:总体概览 -->
-      <ComZTGL
-        v-if="AllData.ComShowID == 1"
-        :isActive="AllData.ComShowID == 1 ? true : false"
-        :showPanel="showPanel"
-      ></ComZTGL>
+      <ComZTGL v-if="AllData.ComShowID == 1" :isActive="AllData.ComShowID == 1 ? true : false" :showPanel="showPanel"></ComZTGL>
       <!-- 2:智慧燃气 -->
-      <ComZHRQ
-        v-if="AllData.ComShowID == 2"
-        :isActive="AllData.ComShowID == 2 ? true : false"
-        :showPanel="showPanel"
-      ></ComZHRQ>
+      <ComZHRQ v-if="AllData.ComShowID == 2" :isActive="AllData.ComShowID == 2 ? true : false" :showPanel="showPanel"></ComZHRQ>
       <!-- 3:智慧排水 -->
-      <ComZHPS
-        v-if="AllData.ComShowID == 3"
-        :isActive="AllData.ComShowID == 3 ? true : false"
-        :showPanel="showPanel"
-      ></ComZHPS>
+      <ComZHPS v-if="AllData.ComShowID == 3" :isActive="AllData.ComShowID == 3 ? true : false" :showPanel="showPanel"></ComZHPS>
       <!-- 4:智慧桥梁 -->
-      <ComZHQL
-        v-if="AllData.ComShowID == 4"
-        :isActive="AllData.ComShowID == 4 ? true : false"
-        :showPanel="showPanel"
-      >
-      </ComZHQL>
+      <ComZHQL v-if="AllData.ComShowID == 4" :isActive="AllData.ComShowID == 4 ? true : false" :showPanel="showPanel"> </ComZHQL>
       <!-- 5:智慧隧道 -->
-      <ComZHSD
-        v-if="AllData.ComShowID == 5"
-        :isActive="AllData.ComShowID == 5 ? true : false"
-        :showPanel="showPanel"
-      ></ComZHSD>
+      <ComZHSD v-if="AllData.ComShowID == 5" :isActive="AllData.ComShowID == 5 ? true : false" :showPanel="showPanel"></ComZHSD>
       <!-- 6:智慧海绵 -->
-      <ComZHHM
-        v-if="AllData.ComShowID == 6"
-        :isActive="AllData.ComShowID == 6 ? true : false"
-        :showPanel="showPanel"
-      ></ComZHHM>
+      <ComZHHM v-if="AllData.ComShowID == 6" :isActive="AllData.ComShowID == 6 ? true : false" :showPanel="showPanel"></ComZHHM>
       <!-- 智慧海绵-监测分析 -->
       <ZHHMJCFX
         v-if="AllData.ComShowID == 61"
@@ -124,11 +87,7 @@
         :showPanel="showPanel"
       ></ZHHMJSPG>
       <!-- 7:防洪排涝 -->
-      <ComFHPL
-        v-if="AllData.ComShowID == 7"
-        :isActive="AllData.ComShowID == 7 ? true : false"
-        :showPanel="showPanel"
-      ></ComFHPL>
+      <ComFHPL v-if="AllData.ComShowID == 7" :isActive="AllData.ComShowID == 7 ? true : false" :showPanel="showPanel"></ComFHPL>
     </div>
     <!-- 底部菜单 -->
     <div id="BottomMenuBox">
@@ -138,11 +97,7 @@
       <!-- 菜单List -->
       <div
         class="MenuList"
-        :class="[
-          'MenuList' + index,
-          'animate__animated',
-          showPanel2 ? 'animate__bounceInUp' : 'animate__bounceInUp',
-        ]"
+        :class="['MenuList' + index, 'animate__animated', showPanel2 ? 'animate__bounceInUp' : 'animate__bounceInUp']"
         v-for="(item, index) in AllData.MenuListData"
         @click="MenuClick(item, index)"
         v-if="BottomshowPanel"
@@ -156,10 +111,7 @@
 
           <!-- 二级菜单 -->
           <!-- <Transition name="slide-fade2"> -->
-          <div
-            v-show="AllData.ErJiMenuShowID == item.id && !!item.children"
-            class="ErJiMenuBox"
-          >
+          <div v-show="AllData.ErJiMenuShowID == item.id && !!item.children" class="ErJiMenuBox">
             <span
               class="ErJiMenuList"
               :class="AllData.ErJiMenuCheckID == item2.id ? 'ErJiMenuCheck' : ''"
@@ -178,11 +130,7 @@
     <Voice></Voice>
   </div>
   <!-- 融云弹窗 -->
-  <ModelRongYun
-    :RYdialogShow="AllData.RYDialog"
-    :ZhuDongBoHao="AllData.ZhuDongBoHao"
-    @OneDialogHide="dialogHide"
-  ></ModelRongYun>
+  <ModelRongYun :RYdialogShow="AllData.RYDialog" :ZhuDongBoHao="AllData.ZhuDongBoHao" @OneDialogHide="dialogHide"></ModelRongYun>
   <!-- 前端组件公共弹窗 -->
   <el-dialog
     modal-class="publicDialogVisible"
@@ -204,60 +152,62 @@
 </template>
 
 <script setup name="oneMapIndex">
-import bus from "@/bus";
-import request from "@/utils/request";
-import { fullscreenToggel } from "@/utils/util";
-import { ref, reactive, toRefs, onMounted } from "vue";
+import bus from '@/bus';
+import request from '@/utils/request';
+import { fullscreenToggel } from '@/utils/util';
+import { ref, reactive, toRefs, onMounted } from 'vue';
 
-import useUserStore from "@/store/modules/user";
+import useUserStore from '@/store/modules/user';
 const userStore = useUserStore();
 // 菜单的图片资源
-import ZTGL from "@/assets/images/Sponge_screen/menu/ZTGL.png";
-import AC_ZTGL from "@/assets/images/Sponge_screen/menu/AC_ZTGL.png";
-import ZHRQ from "@/assets/images/Sponge_screen/menu/ZHRQ.png";
-import AC_ZHRQ from "@/assets/images/Sponge_screen/menu/AC_ZHRQ.png";
-import ZHPS from "@/assets/images/Sponge_screen/menu/ZHPS.png";
-import AC_ZHPS from "@/assets/images/Sponge_screen/menu/AC_ZHPS.png";
-import ZHQL from "@/assets/images/Sponge_screen/menu/ZHQL.png";
-import AC_ZHQL from "@/assets/images/Sponge_screen/menu/AC_ZHQL.png";
-import ZHSD from "@/assets/images/Sponge_screen/menu/ZHSD.png";
-import AC_ZHSD from "@/assets/images/Sponge_screen/menu/AC_ZHSD.png";
-import FXPL from "@/assets/images/Sponge_screen/menu/FXPL.png";
-import AC_FXPL from "@/assets/images/Sponge_screen/menu/AC_FXPL.png";
-import ZHHM from "@/assets/images/Sponge_screen/menu/ZHHM.png";
-import AC_ZHHM from "@/assets/images/Sponge_screen/menu/AC_ZHHM.png";
+import ZTGL from '@/assets/images/Sponge_screen/menu/ZTGL.png';
+import AC_ZTGL from '@/assets/images/Sponge_screen/menu/AC_ZTGL.png';
+import ZHRQ from '@/assets/images/Sponge_screen/menu/ZHRQ.png';
+import AC_ZHRQ from '@/assets/images/Sponge_screen/menu/AC_ZHRQ.png';
+import ZHPS from '@/assets/images/Sponge_screen/menu/ZHPS.png';
+import AC_ZHPS from '@/assets/images/Sponge_screen/menu/AC_ZHPS.png';
+import ZHQL from '@/assets/images/Sponge_screen/menu/ZHQL.png';
+import AC_ZHQL from '@/assets/images/Sponge_screen/menu/AC_ZHQL.png';
+import ZHSD from '@/assets/images/Sponge_screen/menu/ZHSD.png';
+import AC_ZHSD from '@/assets/images/Sponge_screen/menu/AC_ZHSD.png';
+import FXPL from '@/assets/images/Sponge_screen/menu/FXPL.png';
+import AC_FXPL from '@/assets/images/Sponge_screen/menu/AC_FXPL.png';
+import ZHHM from '@/assets/images/Sponge_screen/menu/ZHHM.png';
+import AC_ZHHM from '@/assets/images/Sponge_screen/menu/AC_ZHHM.png';
 // 引用地图
-import OneMap from "./map/newfiberMapBox.vue";
+import OneMap from './map/newfiberMapBox.vue';
 
 // 引用王家坪大桥BIm
-import WangJiaPingBIM from "./BIM/WangJiaPIng.vue";
+import WangJiaPingBIM from './BIM/WangJiaPIng.vue';
 // 引用隧道BIm
-import Tunnel from "./BIM/Tunnel.vue";
+import Tunnel from './BIM/Tunnel.vue';
 // 引用语音识别
-import Voice from "./../voice/recordPage/index.vue";
+import Voice from './../voice/recordPage/index.vue';
 // 引入融云通讯录
-import ModelRongYun from "@/views/RongyunCommunication/ModelRongYun/index.vue"; //融云调用
+import ModelRongYun from '@/views/RongyunCommunication/ModelRongYun/index.vue'; //融云调用
 // 子系统引入
-import ComZTGL from "./components/ZTGL.vue"; //总体概览
-import ComZHRQ from "./components/ZHRQ.vue"; //智慧燃气
-import ComZHPS from "./components/ZHPS.vue"; //智慧排水
-import ComZHQL from "./components/ZHQL.vue"; //智慧桥梁
-import ComZHSD from "./components/ZHSD.vue"; //智慧隧道
-import ComZHHM from "./components/ZHHM.vue"; //智慧海绵
-import ComFHPL from "./components/FHPL.vue"; //防洪排涝
-import ZHHMJCFX from "./components/ZHHM_JCFX.vue"; //智慧海绵-监测分析
-import ZHHMJSPG from "./components/ZHHM_JSPG.vue"; //智慧海绵-建设评估
-import PopupInfo from "@/views/oneMap/components/mapboxPopup.vue"; //地图标注点弹窗
-import dynamicInformation from "@/views/oneMap/components/dynamicInformation.vue"; //地图标注点弹窗
+import ComZTGL from './components/ZTGL.vue'; //总体概览
+import ComZHRQ from './components/ZHRQ.vue'; //智慧燃气
+import ComZHPS from './components/ZHPS.vue'; //智慧排水
+import ComZHQL from './components/ZHQL.vue'; //智慧桥梁
+import ComZHSD from './components/ZHSD.vue'; //智慧隧道
+import ComZHHM from './components/ZHHM.vue'; //智慧海绵
+import ComFHPL from './components/FHPL.vue'; //防洪排涝
+import ZHHMJCFX from './components/ZHHM_JCFX.vue'; //智慧海绵-监测分析
+import ZHHMJSPG from './components/ZHHM_JSPG.vue'; //智慧海绵-建设评估
+import PopupInfo from '@/views/oneMap/components/mapboxPopup.vue'; //地图标注点弹窗
+import dynamicInformation from '@/views/oneMap/components/dynamicInformation.vue'; //地图标注点弹窗
 // 降雨效果
-import CanvasRain from "@/views/oneMap/cityGK/canvasRain.vue"; //降雨效果
+import CanvasRain from '@/views/oneMap/cityGK/canvasRain.vue'; //降雨效果
 // 图层控制面板
-import LayerControl from "@/views/oneMap/LayerControl/LayerControl.vue"; //图层控制面板
+import LayerControl from '@/views/oneMap/LayerControl/LayerControl.vue'; //图层控制面板
 // 前端共同弹窗
-import DialogTabs from "@/views/DialogTabs/dialogTabs.vue";
+import DialogTabs from '@/views/DialogTabs/dialogTabs.vue';
 // 左右滑动
-import ZuoYou1 from "@/assets/images/Sponge_screen/ZuoYou1.png";
-import ZuoYou2 from "@/assets/images/Sponge_screen/ZuoYou2.png";
+import ZuoYou1 from '@/assets/images/Sponge_screen/ZuoYou1.png';
+import ZuoYou2 from '@/assets/images/Sponge_screen/ZuoYou2.png';
+import xtb_img from '@/assets/newImgs/xtb_img.png';
+import mapBoxVectorLayer from '@/utils/GISdocument/mapboxVectorLayer.js';
 // 时间以及天气
 const timer = ref(null);
 const dates = ref(null);
@@ -265,8 +215,8 @@
 const times = ref(null);
 const weather = ref({
   temperature: null,
-  imgNum: "",
-  text: "",
+  imgNum: '',
+  text: '',
 });
 const showPanel = ref(false);
 const showPanel2 = ref(false);
@@ -354,61 +304,61 @@
 // 公共弹窗
 const dialogConfig = reactive({
   visible: false,
-  getSiteId: "",
-  SiteNo: "",
+  getSiteId: '',
+  SiteNo: '',
   data: {},
-  comIDs: ["spjk"],
+  comIDs: ['spjk'],
   customData: [],
-  RefName: "",
-  title: "详情",
+  RefName: '',
+  title: '详情',
 });
 onBeforeMount(() => {
-  console.log("ZhuanTiType", userStore.ZhuanTiType);
+  console.log('ZhuanTiType', userStore.ZhuanTiType);
   if (userStore.ZhuanTiType == 1) {
     // 城市生命线
     AllData.MenuListData = [
       {
-        name: "总体概览",
+        name: '总体概览',
         iocn: ZTGL,
         AC_icon: AC_ZTGL,
         id: 1,
-        Layers: ["路网", "河流水系"],
+        Layers: ['路网', '河流水系'],
       },
       {
-        name: "燃气安全",
+        name: '燃气安全',
         iocn: ZHRQ,
         AC_icon: AC_ZHRQ,
         id: 2,
-        Layers: ["干管", "主管", "干管流向", "主管流向"],
+        Layers: ['干管', '主管', '干管流向', '主管流向'],
       },
       {
-        name: "排水安全",
+        name: '排水安全',
         iocn: ZHPS,
         AC_icon: AC_ZHPS,
         id: 3,
-        Layers: ["雨水管网", "污水管网"],
+        Layers: ['雨水管网', '污水管网'],
         children: [
           {
-            name: "排水安全",
+            name: '排水安全',
             id: 3,
             Layers: [],
           },
           {
-            name: "防汛排涝",
+            name: '防汛排涝',
             id: 7,
             Layers: [],
           },
         ],
       },
       {
-        name: "桥梁安全",
+        name: '桥梁安全',
         iocn: ZHQL,
         AC_icon: AC_ZHQL,
         id: 4,
         Layers: [],
       },
       {
-        name: "隧道安全",
+        name: '隧道安全',
         iocn: ZHSD,
         AC_icon: AC_ZHSD,
         id: 5,
@@ -419,19 +369,19 @@
     // 海绵
     AllData.MenuListData = [
       {
-        name: "城市概览",
+        name: '城市概览',
         iocn: ZHHM,
         AC_icon: AC_ZHHM,
         id: 6,
       },
       {
-        name: "监测分析",
+        name: '监测分析',
         iocn: ZHHM,
         AC_icon: AC_ZHHM,
         id: 61,
       },
       {
-        name: "建设评估",
+        name: '建设评估',
         iocn: ZHHM,
         AC_icon: AC_ZHHM,
         id: 62,
@@ -445,10 +395,10 @@
 onMounted(() => {
   fullscreenToggel();
   AllData.BottmBackGroundShow = true;
-  console.log(AllData.BottmBackGroundShow, "AllData.BottmBackGroundShow");
-  bus.emit("BottomHidden", AllData.BottmBackGroundShow);
+  console.log(AllData.BottmBackGroundShow, 'AllData.BottmBackGroundShow');
+  bus.emit('BottomHidden', AllData.BottmBackGroundShow);
   // 降雨特征点击
-  bus.on("checkRainL", (params) => {
+  bus.on('checkRainL', params => {
     if (params == 1) {
       showRainFlow.value = false;
     } else {
@@ -456,7 +406,7 @@
     }
   });
   // 底部隐藏
-  bus.on("checkBottom", (params) => {
+  bus.on('checkBottom', params => {
     if (params == 1) {
       BottomshowPanel.value = false;
     } else {
@@ -464,15 +414,15 @@
     }
   });
   // 共同弹窗触发事件
-  bus.on("publicDialog", (params) => {
+  bus.on('publicDialog', params => {
     dialogConfig.getSiteId = params.getSiteId;
-    dialogConfig.title = params.title ?? "详情";
+    dialogConfig.title = params.title ?? '详情';
     dialogConfig.comIDs = params.comIDs ?? dialogConfig.comIDs;
     // 打开弹窗
     dialogConfig.visible = true;
   });
   // 共同弹窗触发事件
-  bus.on("publicDialog_Close", (params) => {
+  bus.on('publicDialog_Close', params => {
     // 打开弹窗
     dialogConfig.visible = false;
   });
@@ -482,14 +432,14 @@
   currentTime();
   //initRainImage();
   // 打开融云通讯录主动拨号
-  bus.on("OpenRY", (params) => {
+  bus.on('OpenRY', params => {
     AllData.ZhuDongBoHao = true;
     AllData.RYDialog = true;
-    bus.emit("showRy");
+    bus.emit('showRy');
   });
 
   // 切换专题图
-  bus.on("ChangeZhuanTiTu", (params) => {
+  bus.on('ChangeZhuanTiTu', params => {
     if (params.num == 1) {
       // 一级
       MenuClick(params.MenuData1);
@@ -499,18 +449,18 @@
     }
   });
   // 切换面板显示隐藏
-  bus.on("changeShowPanel", (params) => {
+  bus.on('changeShowPanel', params => {
     showPanel.value = params;
   });
 });
 onBeforeUnmount(() => {
-  bus.off("BottomHidden");
-  bus.off("publicDialog");
-  bus.off("publicDialog_Close");
-  bus.off("OpenRY");
-  bus.off("ChangeZhuanTiTu");
-  bus.off("checkRainL");
-  bus.off("changeShowPanel");
+  bus.off('BottomHidden');
+  bus.off('publicDialog');
+  bus.off('publicDialog_Close');
+  bus.off('OpenRY');
+  bus.off('ChangeZhuanTiTu');
+  bus.off('checkRainL');
+  bus.off('changeShowPanel');
 });
 // 菜单点击
 const MenuClick = (item, index) => {
@@ -529,9 +479,9 @@
   } else {
     AllData.MapShowBol = true;
     // 点击菜单时隐藏所有图层
-    bus.emit("clearAllLayer");
+    bus.emit('clearAllLayer');
     // 打开默认的菜单
-    bus.emit("SetLayerShow", item.Layers);
+    bus.emit('SetLayerShow', item.Layers);
   }
 };
 // 二级菜单点击
@@ -550,10 +500,10 @@
 const toRYBox = () => {
   AllData.RYDialog = true;
   AllData.ZhuDongBoHao = false;
-  bus.emit("showRy");
+  bus.emit('showRy');
 };
 // 关闭融云通讯录弹窗
-const dialogHide = (val) => {
+const dialogHide = val => {
   if (!val) {
     AllData.RYDialog = false;
     AllData.ZhuDongBoHao = false;
@@ -561,19 +511,20 @@
 };
 //地图点击事件
 const mapClick = async (point, properties, feature) => {
-  console.log("point", point);
-  console.log("properties", properties);
-  console.log("feature---", feature);
+  console.log('point', point);
+  console.log('properties', properties);
+  console.log('feature---', feature);
   if (!feature) {
     let currentZoom = newfiberMapbox.map.getZoom();
-    console.log("currentZoom--", currentZoom);
-    if (currentZoom >= 17) {
+    console.log('currentZoom--', currentZoom);
+    if (currentZoom >= 18) {
       let clickPoint = turf.point(point);
+      let positionAddress = '';
       gcoord.transform(clickPoint, gcoord.WGS84, gcoord.BD09);
-      console.log("clickPoint---", clickPoint, clickPoint.geometry.coordinates);
+      console.log('clickPoint---', clickPoint, clickPoint.geometry.coordinates);
       let data = await request({
         url: `/bdApi//baiduservice/panorama`,
-        method: "GET",
+        method: 'GET',
         params: {
           location: `${clickPoint.geometry.coordinates[0]},${clickPoint.geometry.coordinates[1]}`,
           fov: 180,
@@ -582,11 +533,31 @@
         },
       });
       if (data && data.data) {
-        data.data.base64 = "data:image/jpeg;base64," + data.data.base64;
+        data.data.base64 = 'data:image/jpeg;base64,' + data.data.base64;
       }
-      console.log("data----", data);
+      console.log('data----', data);
       gcoord.transform(clickPoint, gcoord.BD09, gcoord.WGS84);
-      bus.emit("popupcontent", {
+      gcoord.transform(clickPoint, gcoord.WGS84, gcoord.GCJ02);
+      let regeodata = await request({
+        url: `/amap/v3/geocode/regeo`,
+        method: 'GET',
+        params: {
+          location: `${clickPoint.geometry.coordinates[0]},${clickPoint.geometry.coordinates[1]}`,
+          key: '76eac14980622704ba95c1bf080f3b4c',
+          radius: 1000,
+          extensions: 'all',
+          output: 'json',
+        },
+      });
+      if (regeodata.info === 'OK') {
+        console.log('坐标返地名data----', data);
+        positionAddress = regeodata.regeocode.formatted_address;
+      }
+      gcoord.transform(clickPoint, gcoord.GCJ02, gcoord.WGS84);
+      mapBoxVectorLayer.removeByIds(['clickPoint']);
+      mapBoxVectorLayer.addGeojsonSymbol('clickPoint', turf.featureCollection([clickPoint]), xtb_img, 2);
+      data.roadName = positionAddress;
+      bus.emit('popupcontent', {
         popupShow: true,
         point: point,
         popupInfo: data,
@@ -594,21 +565,19 @@
     }
   }
   if (properties) {
-    if (feature == "rq_pipeline_info") {
-      if (!!newfiberMapbox.getLayerByName("rqLine")) {
-        newfiberMapbox.removeLayer(newfiberMapbox.getLayerByName("rqLine"));
+    if (feature == 'rq_pipeline_info') {
+      if (!!newfiberMapbox.getLayerByName('rqLine')) {
+        newfiberMapbox.removeLayer(newfiberMapbox.getLayerByName('rqLine'));
       }
-      let rqLine = turf.featureCollection([
-        turf.feature(Terraformer.WKT.parse(properties.geometry)),
-      ]);
+      let rqLine = turf.featureCollection([turf.feature(Terraformer.WKT.parse(properties.geometry))]);
       let layer = new mapboxL7.LineLayer({
-        name: "rqLine",
+        name: 'rqLine',
       })
         .source(rqLine)
         .size(4)
-        .shape("line")
-        .texture("arrow")
-        .color("rgb(241, 159, 27)")
+        .shape('line')
+        .texture('arrow')
+        .color('rgb(241, 159, 27)')
         .animate({
           interval: 2, // 间隔
           duration: 2, // 持续时间，延时
@@ -619,11 +588,11 @@
           lineTexture: true, // 开启线的贴图功能
           iconStep: 50, // 设置贴图纹理的间距
           borderWidth: 0, // 默认文 0，最大有效值为 0.5
-          borderColor: "#fff", // 默认为 #ccc
+          borderColor: '#fff', // 默认为 #ccc
         });
       newfiberMapbox.addLayer(layer);
     }
-    bus.emit("popupcontent", {
+    bus.emit('popupcontent', {
       popupShow: true,
       point: point,
       popupInfo: properties,
@@ -638,20 +607,12 @@
   let month = date.getMonth() + 1; // 月
   let day = date.getDate(); // 日
   let hour = date.getHours(); // 时
-  hour = hour < 10 ? "0" + hour : hour; // 如果只有一位，则前面补零
+  hour = hour < 10 ? '0' + hour : hour; // 如果只有一位，则前面补零
   let minute = date.getMinutes(); // 分
-  minute = minute < 10 ? "0" + minute : minute; // 如果只有一位，则前面补零
+  minute = minute < 10 ? '0' + minute : minute; // 如果只有一位，则前面补零
   let second = date.getSeconds(); // 秒
-  second = second < 10 ? "0" + second : second; // 如果只有一位，则前面补零
-  let weekAry = new Array(
-    "星期日",
-    "星期一",
-    "星期二",
-    "星期三",
-    "星期四",
-    "星期五",
-    "星期六"
-  );
+  second = second < 10 ? '0' + second : second; // 如果只有一位，则前面补零
+  let weekAry = new Array('星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六');
   weeks.value = weekAry[date.getDay()];
   dates.value = `${year}-${month}-${day}`;
   times.value = `${hour}:${minute}:${second}`;
@@ -674,11 +635,11 @@
   // }
 };
 // 二级菜单展示
-const handleMouseEnter = (item) => {
+const handleMouseEnter = item => {
   AllData.ErJiMenuShowID = item.id;
 };
 // 二级菜单展示
-const handleMouseLeave = (item) => {
+const handleMouseLeave = item => {
   AllData.ErJiMenuShowID = null;
 };
 </script>
@@ -701,7 +662,7 @@
     #oneMapHeader {
       width: 100%;
       height: 100px;
-      background: url("@/assets/images/Sponge_screen/db_img.png") no-repeat center;
+      background: url('@/assets/images/Sponge_screen/db_img.png') no-repeat center;
       background-size: cover;
       z-index: 100;
       position: absolute;
@@ -785,17 +746,17 @@
         cursor: pointer;
       }
       .goHome {
-        background: url("@/assets/images/Sponge_screen/gb_btn.png") no-repeat center;
+        background: url('@/assets/images/Sponge_screen/gb_btn.png') no-repeat center;
         background-size: contain;
         right: 150px;
       }
       .goUser_com {
-        background: url("@/assets/images/Sponge_screen/hs_btn.png") no-repeat center;
+        background: url('@/assets/images/Sponge_screen/hs_btn.png') no-repeat center;
         background-size: contain;
         right: 100px;
       }
       .goClose_com {
-        background: url("@/assets/images/Sponge_screen/sy_btn.png") no-repeat center;
+        background: url('@/assets/images/Sponge_screen/sy_btn.png') no-repeat center;
         background-size: contain;
         right: 50px;
       }
@@ -850,7 +811,7 @@
       bottom: 0;
       width: 952px;
       height: 62px;
-      background: url("@/assets/images/Sponge_screen/menu/DB_img.png") no-repeat center;
+      background: url('@/assets/images/Sponge_screen/menu/DB_img.png') no-repeat center;
       background-size: cover;
     }
     // 图标菜单样式 从左到右按照顺序进行设定
@@ -984,7 +945,7 @@
     height: 800px;
     border: 1px solid #15d2fd;
     .el-dialog__header {
-      background: url("@/assets/images/Sponge_screen/DialogTitleBG.png") no-repeat center;
+      background: url('@/assets/images/Sponge_screen/DialogTitleBG.png') no-repeat center;
       background-size: cover;
       padding: 0;
       height: 60px;
diff --git a/src/views/oneMap/map/newfiberMapBox.vue b/src/views/oneMap/map/newfiberMapBox.vue
index 0b0bf69..e4d9094 100644
--- a/src/views/oneMap/map/newfiberMapBox.vue
+++ b/src/views/oneMap/map/newfiberMapBox.vue
@@ -4,26 +4,19 @@
   </div>
 </template>
 <script>
-import {
-  reactive,
-  toRefs,
-  onBeforeMount,
-  onMounted,
-  nextTick,
-  onBeforeUnmount,
-} from "vue";
-import bus from "@/bus";
-import axios from "axios";
-import buildingGeojson from "@/assets/yanAnBuilding.json";
-import yanAnRoad from "@/assets/yanAnRoad.json";
-import yanAnWater from "@/assets/yanAnWater.json";
-import { buffer } from "ol/size";
+import { reactive, toRefs, onBeforeMount, onMounted, nextTick, onBeforeUnmount } from 'vue';
+import bus from '@/bus';
+import axios from 'axios';
+import buildingGeojson from '@/assets/yanAnBuilding.json';
+import yanAnRoad from '@/assets/yanAnRoad.json';
+import yanAnWater from '@/assets/yanAnWater.json';
+import { buffer } from 'ol/size';
 export default {
   components: {},
   props: {
     initJson: {
       type: String,
-      default: () => "/static/libs/mapbox/style/floodOneMap.json",
+      default: () => '/static/libs/mapbox/style/floodOneMap.json',
     },
     loadCallback: {
       type: Function,
@@ -35,9 +28,9 @@
       layerIds: [],
     });
     let geojson = {
-      point: { type: "FeatureCollection", features: [] },
-      polygon: { type: "FeatureCollection", features: [] },
-      linestring: { type: "FeatureCollection", features: [] },
+      point: { type: 'FeatureCollection', features: [] },
+      polygon: { type: 'FeatureCollection', features: [] },
+      linestring: { type: 'FeatureCollection', features: [] },
     };
     let map = null;
     let config = null;
@@ -54,21 +47,14 @@
       const { style, localStyle } = config.params.init;
       let styleJson = (
         await axios.get(
-          localStyle
-            ? localStyle
-            : (style.includes("http") ? "" : location.origin + basemap) +
-                config.params.init.style
+          localStyle ? localStyle : (style.includes('http') ? '' : location.origin + basemap) + config.params.init.style
         )
       ).data;
-      styleJson.glyphs = styleJson.glyphs.includes("http")
-        ? styleJson.glyphs
-        : location.origin + styleJson.glyphs;
-      styleJson.sprite = styleJson.sprite.includes("http")
-        ? styleJson.sprite
-        : location.origin + styleJson.sprite;
+      styleJson.glyphs = styleJson.glyphs.includes('http') ? styleJson.glyphs : location.origin + styleJson.glyphs;
+      styleJson.sprite = styleJson.sprite.includes('http') ? styleJson.sprite : location.origin + styleJson.sprite;
 
       window.newfiberMapbox = new mapboxL7.Scene({
-        id: "cesiumContainer",
+        id: 'cesiumContainer',
         map: new mapboxL7.Mapbox({
           style: styleJson,
           // style:  localStyle?localStyle:(style.includes('http')?'':location.origin + config.params.basemap) + config.params.init.style,
@@ -78,27 +64,24 @@
       });
       map = newfiberMapbox.map;
       map.ogcLayers = [];
+      map.setMaxZoom(18);
       newfiberMapbox.unLoadLayers = [];
 
-      map.on("load", async () => {
+      map.on('load', async () => {
         const mouseLocation = new mapboxL7.MouseLocation({
-          transform: (position) => {
+          transform: position => {
             return position;
           },
         });
         newfiberMapbox.addControl(mouseLocation);
         let { sprites, l7 } = config.params;
-        (sprites || []).forEach((url) =>
-          map.style._loadSprite(
-            url.includes("http") ? url : window.location.origin.split("#")[0] + url
-          )
+        (sprites || []).forEach(url =>
+          map.style._loadSprite(url.includes('http') ? url : window.location.origin.split('#')[0] + url)
         );
-        ((l7 || []).images || []).forEach((item) =>
+        ((l7 || []).images || []).forEach(item =>
           newfiberMapbox.addImage(
             item.name,
-            item.url.includes("http")
-              ? item.url
-              : window.location.origin.split("#")[0] + item.url
+            item.url.includes('http') ? item.url : window.location.origin.split('#')[0] + item.url
           )
         );
         addYanAnBuilding();
@@ -108,17 +91,13 @@
         await loadData();
         props.loadCallback && props.loadCallback();
         // getLayerIdByClick();
-        newfiberMapbox
-          .getLayers()
-          .filter(
-            (i) => highlightLayers[i.newfiberId] && (highlightLayers[i.newfiberId] = i)
-          );
+        newfiberMapbox.getLayers().filter(i => highlightLayers[i.newfiberId] && (highlightLayers[i.newfiberId] = i));
 
         let timeout = setTimeout(() => {
           let { pitch, center } = config.params.init;
           pitch && newfiberMapbox.map.setPitch(pitch);
           center && newfiberMapbox.map.setCenter(center);
-          (config.orders || []).forEach((item) => setLayerOrder(...item));
+          (config.orders || []).forEach(item => setLayerOrder(...item));
           clearTimeout(timeout);
         }, 1000);
         // three();
@@ -126,40 +105,35 @@
         // getLayerIdByClick();
       });
 
-      let layerIds = (config.mapbox || []).map((i) => i.id);
-      map.on("click", (e) => {
-        Object.values(highlightLayers).forEach((layer) => {
-          if (layer.setData) layer.setData({ type: "FeatureCollection", features: [] });
+      let layerIds = (config.mapbox || []).map(i => i.id);
+      map.on('click', e => {
+        Object.values(highlightLayers).forEach(layer => {
+          if (layer.setData) layer.setData({ type: 'FeatureCollection', features: [] });
         });
         const feature = (
           map.queryRenderedFeatures([
             [e.point.x - 10 / 2, e.point.y - 10 / 2],
             [e.point.x + 10 / 2, e.point.y + 10 / 2],
           ]) || []
-        ).filter((i) => layerIds.includes(i.layer.id))[0];
+        ).filter(i => layerIds.includes(i.layer.id))[0];
         setHighlight(feature);
-        event.emit(
-          "map-click",
-          Object.values(e.lngLat),
-          (feature || {}).properties,
-          ((feature || {}).layer || {}).id
-        );
+        event.emit('map-click', Object.values(e.lngLat), (feature || {}).properties, ((feature || {}).layer || {}).id);
       });
 
       async function getGeoJSON() {
         config.geojsonMvts = {};
         let url = config.mapbox
-          .filter((i) => i.mType == "geojsonMvt")
-          .map((item) => {
+          .filter(i => i.mType == 'geojsonMvt')
+          .map(item => {
             let { mType, columns, geom_column, id, key } = item;
-            let sourceID = geom_column ? key + "_" + (geom_column || "") : key;
+            let sourceID = geom_column ? key + '_' + (geom_column || '') : key;
             let params = [];
             if (columns) params.push(`columns=${columns}`);
             if (geom_column) params.push(`geom_column=${geom_column}`);
-            return config.params.mvt + `/v1/geojson/${key}?` + params.join("&");
+            return config.params.mvt + `/v1/geojson/${key}?` + params.join('&');
           });
         url = Array.from(new Set(url));
-        let fetchs = url.map((url) => axios.get(url));
+        let fetchs = url.map(url => axios.get(url));
         let results = await Promise.all(fetchs);
         url.forEach((url, index) => (config.geojsonMvts[url] = results[index].data));
       }
@@ -169,36 +143,28 @@
       let { mapbox, l7, ogc } = config;
       if (mapbox) initMapBoxLayer();
       if (l7)
-        l7.forEach((item) => {
+        l7.forEach(item => {
           let { id, columns, filter } = item;
           let params = [];
           if (columns) params.push(`columns=${columns}`);
           if (filter) params.push(`filter=${filter}`);
           id
             ? axios
-                .get(config.params.mvt + `/v1/geojson/${id}?` + params.join("&"))
+                .get(config.params.mvt + `/v1/geojson/${id}?` + params.join('&'))
                 .then(({ data: geojson }) => initMapBoxL7Class(item, geojson))
             : initMapBoxL7Class(item, geojson[item.key] || turf.featureCollection([]));
         });
 
       if (ogc)
-        ogc.forEach((item) => {
+        ogc.forEach(item => {
           let { id, type, params, methods } = item;
           Object.keys(params).forEach(
-            (i) =>
-              (params[i] =
-                typeof params[i] == "string"
-                  ? params[i].includes("||")
-                    ? eval(params[i])
-                    : params[i]
-                  : params[i])
+            i => (params[i] = typeof params[i] == 'string' ? (params[i].includes('||') ? eval(params[i]) : params[i]) : params[i])
           );
           let layer = new mapboxgl1[type](params);
           layer.newfiberId = id;
-          methods.forEach((method) => {
-            let ms = method.params.map((i) =>
-              typeof i == "string" ? (i.includes("||") ? eval(i) : i) : i
-            );
+          methods.forEach(method => {
+            let ms = method.params.map(i => (typeof i == 'string' ? (i.includes('||') ? eval(i) : i) : i));
             layer[method.name](...ms);
           });
           map.ogcLayers.push(layer);
@@ -206,10 +172,8 @@
 
       function initMapBoxL7Class({ type, params, methods, id, show, key }, geojson) {
         let layer = new mapboxL7[type](params).source(geojson);
-        methods.forEach((method) => {
-          let ms = method.params.map((i) =>
-            typeof i == "string" ? (i.includes("||") ? eval(i) : i) : i
-          );
+        methods.forEach(method => {
+          let ms = method.params.map(i => (typeof i == 'string' ? (i.includes('||') ? eval(i) : i) : i));
           layer[method.name](...ms);
         });
         layer.newfiberId = key;
@@ -219,36 +183,29 @@
       }
 
       function initMapBoxLayer() {
-        mapbox.forEach((item) => {
+        mapbox.forEach(item => {
           let { mType, columns, geom_column, id, key } = item;
-          let sourceID = geom_column ? key + "_" + (geom_column || "") : key;
+          let sourceID = geom_column ? key + '_' + (geom_column || '') : key;
           let params = [];
           if (columns) params.push(`columns=${columns}`);
           if (geom_column) params.push(`geom_column=${geom_column}`);
           if (!!!map.getSource(sourceID)) {
-            let flag = mType == "geojson";
+            let flag = mType == 'geojson';
             flag
               ? map.addSource(sourceID, { type: mType, data: geojson[key] })
               : map.addSource(sourceID, {
-                  ...(mType == "mvt"
+                  ...(mType == 'mvt'
                     ? {
-                        type: "vector",
-                        tiles: [
-                          config.params.mvt +
-                            `/v1/${mType}/${key}/{z}/{x}/{y}?` +
-                            params.join("&"),
-                        ],
+                        type: 'vector',
+                        tiles: [config.params.mvt + `/v1/${mType}/${key}/{z}/{x}/{y}?` + params.join('&')],
                         tileSize: 512,
-                        scheme: "xyz",
+                        scheme: 'xyz',
                         maxzoom: 14,
                         minzoom: 1,
                       }
                     : {
-                        type: "geojson",
-                        data:
-                          config.geojsonMvts[
-                            config.params.mvt + `/v1/geojson/${key}?` + params.join("&")
-                          ],
+                        type: 'geojson',
+                        data: config.geojsonMvts[config.params.mvt + `/v1/geojson/${key}?` + params.join('&')],
                       }),
                 });
           }
@@ -263,64 +220,48 @@
       if (!!!layername) return;
       if (((config || {}).filter || [])[layername]) {
         config.filter[layername].layerName.forEach((name, index) => {
-          let layer = newfiberMapbox.getLayers().filter((i) => i.newfiberId == name)[0];
+          let layer = newfiberMapbox.getLayers().filter(i => i.newfiberId == name)[0];
           let fValues = config.filter[layername].filter[index];
           if (layer) {
             let geojson = layer.getSource().originData;
-            geojson.features.forEach(
-              (i) =>
-                fValues.includes(i.properties.type) && (i.properties.visible = isCheck)
-            );
+            geojson.features.forEach(i => fValues.includes(i.properties.type) && (i.properties.visible = isCheck));
             layer.setData(geojson);
           }
           if (map.getLayer(name)) {
             fValues = fValues.filter(Boolean);
             let filter = map.getFilter(name);
             if (!fValues.length) fValues = values;
-            if (filter[0] == "in") {
-              isCheck
-                ? filter.push(...fValues)
-                : (filter = filter.filter((i) => !fValues.includes(i)));
+            if (filter[0] == 'in') {
+              isCheck ? filter.push(...fValues) : (filter = filter.filter(i => !fValues.includes(i)));
             } else {
               let _filter =
                 filter[filter.length - 1][filter[filter.length - 1].length - 1][
-                  filter[filter.length - 1][filter[filter.length - 1].length - 1].length -
-                    1
+                  filter[filter.length - 1][filter[filter.length - 1].length - 1].length - 1
                 ];
               isCheck
                 ? filter[filter.length - 1][filter[filter.length - 1].length - 1][
-                    filter[filter.length - 1][filter[filter.length - 1].length - 1]
-                      .length - 1
+                    filter[filter.length - 1][filter[filter.length - 1].length - 1].length - 1
                   ].push(...fValues)
                 : (filter[filter.length - 1][filter[filter.length - 1].length - 1][
-                    filter[filter.length - 1][filter[filter.length - 1].length - 1]
-                      .length - 1
-                  ] = _filter.filter((i) => !fValues.includes(i)));
+                    filter[filter.length - 1][filter[filter.length - 1].length - 1].length - 1
+                  ] = _filter.filter(i => !fValues.includes(i)));
             }
             map.setFilter(name, filter);
           }
         });
-        return (
-          config.filter[layername].easeTo &&
-          isCheck &&
-          map.easeTo(config.filter[layername].easeTo)
-        );
+        return config.filter[layername].easeTo && isCheck && map.easeTo(config.filter[layername].easeTo);
       }
 
       let features = Object.values(geojson)
-        .map((i) => i.features)
+        .map(i => i.features)
         .flat(Infinity)
-        .filter((i) => i.properties.type == layername);
+        .filter(i => i.properties.type == layername);
       if (features.length) {
-        let types = Array.from(
-          new Set(features.map((i) => i.geometry.type.toLocaleLowerCase()))
-        );
-        types.forEach((type1) => {
+        let types = Array.from(new Set(features.map(i => i.geometry.type.toLocaleLowerCase())));
+        types.forEach(type1 => {
           let filter = map.getFilter(type1);
-          if (filter[0] == "in") {
-            isCheck
-              ? filter.push(layername)
-              : (filter = filter.filter((i) => i != layername));
+          if (filter[0] == 'in') {
+            isCheck ? filter.push(layername) : (filter = filter.filter(i => i != layername));
           } else {
             let _filter =
               filter[filter.length - 1][filter[filter.length - 1].length - 1][
@@ -328,86 +269,75 @@
               ];
             isCheck
               ? filter[filter.length - 1][filter[filter.length - 1].length - 1][
-                  filter[filter.length - 1][filter[filter.length - 1].length - 1].length -
-                    1
+                  filter[filter.length - 1][filter[filter.length - 1].length - 1].length - 1
                 ].push(layername)
               : (filter[filter.length - 1][filter[filter.length - 1].length - 1][
-                  filter[filter.length - 1][filter[filter.length - 1].length - 1].length -
-                    1
-                ] = _filter.filter((i) => i != layername));
+                  filter[filter.length - 1][filter[filter.length - 1].length - 1].length - 1
+                ] = _filter.filter(i => i != layername));
           }
           map.setFilter(type1, filter);
         });
       }
 
-      let layer = newfiberMapbox.getLayers().filter((i) => i.newfiberId == layername)[0];
+      let layer = newfiberMapbox.getLayers().filter(i => i.newfiberId == layername)[0];
       if (!!!layer) {
-        layer = newfiberMapbox.unLoadLayers.filter((i) => i.newfiberId == layername)[0];
+        layer = newfiberMapbox.unLoadLayers.filter(i => i.newfiberId == layername)[0];
         isCheck && layer && newfiberMapbox.addLayer(layer);
       }
-      layer && layer[["hide", "show"][Number(isCheck)]]();
+      layer && layer[['hide', 'show'][Number(isCheck)]]();
 
       layer = map.getLayer(layername);
-      layer &&
-        map.setLayoutProperty(layername, "visibility", isCheck ? "visible" : "none");
+      layer && map.setLayoutProperty(layername, 'visibility', isCheck ? 'visible' : 'none');
 
-      layer = map.getLayer(layername + "_text");
-      layer &&
-        map.setLayoutProperty(
-          layername + "_text",
-          "visibility",
-          isCheck ? "visible" : "none"
-        );
+      layer = map.getLayer(layername + '_text');
+      layer && map.setLayoutProperty(layername + '_text', 'visibility', isCheck ? 'visible' : 'none');
 
-      layer = map.ogcLayers.filter((i) => i.id == layername)[0];
-      layer && (layer.map ? layer[isCheck ? "show" : "hide"]() : layer.addTo(map));
+      layer = map.ogcLayers.filter(i => i.id == layername)[0];
+      layer && (layer.map ? layer[isCheck ? 'show' : 'hide']() : layer.addTo(map));
     };
 
     const getGeojsonByType = ({ type, callback }) => {
       let geojs = turf.featureCollection(
         Object.values(geojson)
-          .map((i) => i.features)
+          .map(i => i.features)
           .flat(Infinity)
-          .filter((i) => i.properties.type == type)
+          .filter(i => i.properties.type == type)
       );
       callback && callback(geojs);
     };
 
-    const removeLayers = (ids) => {
+    const removeLayers = ids => {
       let { getLayers, removeAllLayer, removeLayer: removeLayerL7 } = newfiberMapbox;
       let { getLayer, removeLayer } = map;
 
       if (!!!ids) {
-        allData.layerIds.forEach((id) => getLayer(id) && removeLayer(id));
+        allData.layerIds.forEach(id => getLayer(id) && removeLayer(id));
         return removeAllLayer();
       }
 
-      ids.forEach((id) => {
+      ids.forEach(id => {
         getLayer(id) && removeLayer(id);
-        getLayers().forEach((layer) => layer.newfiberId == id && removeLayerL7(layer));
+        getLayers().forEach(layer => layer.newfiberId == id && removeLayerL7(layer));
       });
     };
 
-    const removeMapDatas = (types) => {
+    const removeMapDatas = types => {
       !!!types
-        ? Object.keys(geojson).forEach((key) => (geojson[key].features.length = 0))
+        ? Object.keys(geojson).forEach(key => (geojson[key].features.length = 0))
         : Object.keys(geojson).forEach(
-            (key) =>
-              (geojson[key].features = geojson[key].features.filter(
-                (feature) => !types.includes(feature.properties.type)
-              ))
+            key => (geojson[key].features = geojson[key].features.filter(feature => !types.includes(feature.properties.type)))
           );
       return refreshGeoJSON();
     };
 
-    const setLegendData = (list) => {
-      list.forEach((i) => {
+    const setLegendData = list => {
+      list.forEach(i => {
         let points = [];
         if (!i.data) return;
-        i.data.features.forEach((a) => {
+        i.data.features.forEach(a => {
           if (!!!a || !!!a.properties) return;
           (a.properties.minzoom = a.properties.minzoom || 0),
-            (a.properties.color = a.properties.color || "rgba(0,0,0,1)"),
+            (a.properties.color = a.properties.color || 'rgba(0,0,0,1)'),
             (a.properties.type = a.properties.type || i.layername);
           a.properties.name =
             a.properties.name ||
@@ -417,10 +347,7 @@
             a.properties.sewageName ||
             a.properties.sectionName ||
             a.properties.pumpName;
-          if (
-            a.properties.name &&
-            !turf.getType(a).toLocaleLowerCase().includes("point")
-          ) {
+          if (a.properties.name && !turf.getType(a).toLocaleLowerCase().includes('point')) {
             let center = turf.pointOnFeature(a);
             center.properties = { ...a.properties, minzoom: 10 };
             center.properties.geometry = Terraformer.WKT.convert(center.geometry);
@@ -432,58 +359,47 @@
 
       let types = {};
       list
-        .map((i) => i.data && i.data.features)
+        .map(i => i.data && i.data.features)
         .filter(Boolean)
         .flat(Infinity)
-        .forEach((feature) => {
+        .forEach(feature => {
           if (!!!feature || !!!feature.properties) return;
           feature.properties.geometry = Terraformer.WKT.convert(feature.geometry);
           let type = feature.geometry.type.toLocaleLowerCase();
-          let flag = type.includes("multi");
-          type = type.replaceAll("multi", "");
+          let flag = type.includes('multi');
+          type = type.replaceAll('multi', '');
           let features = null;
           if (flag) features = turf.flatten(feature).features;
           !!!types[type] && (types[type] = []);
           types[type].push(...(features ? features : [feature]));
         });
 
-      Object.keys(types).forEach((key) => geojson[key].features.push(...types[key]));
+      Object.keys(types).forEach(key => geojson[key].features.push(...types[key]));
       refreshGeoJSON();
     };
 
     const refreshGeoJSON = () => {
-      Object.keys(geojson).forEach(
-        (key) => map.getSource(key) && map.getSource(key).setData(geojson[key])
-      );
+      Object.keys(geojson).forEach(key => map.getSource(key) && map.getSource(key).setData(geojson[key]));
       map.triggerRepaint();
     };
 
     const setGeoJSON = ({ json, key }) => {
-      let layer = newfiberMapbox.getLayers().filter((i) => i.newfiberId == key)[0];
-      console.log("layer----", layer);
+      let layer = newfiberMapbox.getLayers().filter(i => i.newfiberId == key)[0];
+      console.log('layer----', layer);
       if (!!!layer) {
-        layer = newfiberMapbox.unLoadLayers.filter((i) => i.newfiberId == key)[0];
+        layer = newfiberMapbox.unLoadLayers.filter(i => i.newfiberId == key)[0];
         layer && layer.setData(json);
         layer && newfiberMapbox.addLayer(layer);
       }
       if (layer) return layer.setData(json);
-      setLegendData([{ data: json, layername: key, type: "point" }]);
+      setLegendData([{ data: json, layername: key, type: 'point' }]);
     };
 
-    const beansToMap = ({
-      beans,
-      fields = { geometry: "geometry", lng: "lng", lat: "lat", name: "name" },
-      type,
-      isConvert,
-    }) => {
+    const beansToMap = ({ beans, fields = { geometry: 'geometry', lng: 'lng', lat: 'lat', name: 'name' }, type, isConvert }) => {
       let geojson = turf.featureCollection(
         beans
-          .filter(
-            (i) =>
-              i[fields.geometry] ||
-              (Boolean(Number(i[fields.lng])) && Boolean(Number(i[fields.lat])))
-          )
-          .map((i) => {
+          .filter(i => i[fields.geometry] || (Boolean(Number(i[fields.lng])) && Boolean(Number(i[fields.lat]))))
+          .map(i => {
             let feature = null;
             if (i[fields.geometry])
               feature = turf.feature(Terraformer.WKT.parse(i[fields.geometry]), {
@@ -507,30 +423,22 @@
       let array = {};
       features = features.forEach ? features : [features];
       Object.values(highlightLayers).forEach(
-        (layer) =>
-          layer.setData && layer.setData({ type: "FeatureCollection", features: [] })
+        layer => layer.setData && layer.setData({ type: 'FeatureCollection', features: [] })
       );
-      features.forEach((feature) => {
-        if (
-          !!!feature ||
-          !Boolean(Object.keys(feature).length) ||
-          !feature.properties.geometry
-        )
-          return;
+      features.forEach(feature => {
+        if (!!!feature || !Boolean(Object.keys(feature).length) || !feature.properties.geometry) return;
         let geometry = Terraformer.WKT.parse(feature.properties.geometry);
         let geoFeature = turf.feature(geometry, feature.properties);
-        let type = geometry.type.toLocaleLowerCase().replaceAll("multi", "");
-        let key = Object.keys(highlightLayers).filter(
-          (key) => key.lastIndexOf(type) > -1
-        )[0];
+        let type = geometry.type.toLocaleLowerCase().replaceAll('multi', '');
+        let key = Object.keys(highlightLayers).filter(key => key.lastIndexOf(type) > -1)[0];
         if (!array[key]) array[key] = [];
         array[key].push(geoFeature);
       });
       Object.keys(array).forEach(
-        (key) =>
+        key =>
           highlightLayers[key] &&
           highlightLayers[key].setData({
-            type: "FeatureCollection",
+            type: 'FeatureCollection',
             features: array[key],
           })
       );
@@ -541,51 +449,38 @@
     };
 
     const getLayerIdByClick = () => {
-      map.getStyle().layers.forEach((i) =>
-        map.on("click", i.id, (a, b, c, d) => {
-          console.log("layer-id", a.features[0].layer.id);
+      map.getStyle().layers.forEach(i =>
+        map.on('click', i.id, (a, b, c, d) => {
+          console.log('layer-id', a.features[0].layer.id);
         })
       );
     };
 
-    const updateStyle = (styleJson) => {
-      styleJson.glyphs = styleJson.glyphs.includes("http")
-        ? styleJson.glyphs
-        : location.origin + styleJson.glyphs;
-      styleJson.sprite = styleJson.sprite.includes("http")
-        ? styleJson.sprite
-        : location.origin + styleJson.sprite;
+    const updateStyle = styleJson => {
+      styleJson.glyphs = styleJson.glyphs.includes('http') ? styleJson.glyphs : location.origin + styleJson.glyphs;
+      styleJson.sprite = styleJson.sprite.includes('http') ? styleJson.sprite : location.origin + styleJson.sprite;
 
       const currentStyle = map.getStyle();
       styleJson.sources = Object.assign({}, currentStyle.sources, styleJson.sources);
-      let labelIndex = styleJson.layers.findIndex((el) => {
-        return el.id == "waterway-label";
+      let labelIndex = styleJson.layers.findIndex(el => {
+        return el.id == 'waterway-label';
       });
       if (labelIndex === -1) {
         labelIndex = styleJson.layers.length;
       }
-      const appLayers = currentStyle.layers.filter((el) => {
-        return (
-          el.source &&
-          el.source != "mapbox://mapbox.satellite" &&
-          el.source != "mapbox" &&
-          el.source != "composite"
-        );
+      const appLayers = currentStyle.layers.filter(el => {
+        return el.source && el.source != 'mapbox://mapbox.satellite' && el.source != 'mapbox' && el.source != 'composite';
       });
-      styleJson.layers = [
-        ...styleJson.layers.slice(0, labelIndex),
-        ...appLayers,
-        ...styleJson.layers.slice(labelIndex, -1),
-      ];
+      styleJson.layers = [...styleJson.layers.slice(0, labelIndex), ...appLayers, ...styleJson.layers.slice(labelIndex, -1)];
       map.setStyle(styleJson);
     };
     //添加延安建筑白膜
     const addYanAnBuilding = () => {
       map.addLayer({
-        id: "buildingLayer",
-        type: "fill-extrusion",
+        id: 'buildingLayer',
+        type: 'fill-extrusion',
         source: {
-          type: "geojson",
+          type: 'geojson',
           data: buildingGeojson,
         },
         // //绘画功能
@@ -593,35 +488,35 @@
           // Get the fill-extrusion-color from the source 'color' property.   从source 'color'属性获取fill- extrusive -color。
           // 'fill-extrusion-color':'rgba(200, 100, 240, 0.4)',
           // "fill-extrusion-color":['get','color'],//加载数据中的颜色
-          "fill-extrusion-color": {
+          'fill-extrusion-color': {
             //根据数值中加载相对应颜色
-            property: "height_3", // this will be your density property form you geojson
+            property: 'height_3', // this will be your density property form you geojson
             stops: [
-              [10, "#009bdd"],
-              [20, "#009bdd"],
-              [30, "#009bdd"],
-              [80, "#00a8de"],
-              [100, "#24edff"],
-              [125, "#24edff"],
-              [300, "#24edff"],
+              [10, '#009bdd'],
+              [20, '#009bdd'],
+              [30, '#009bdd'],
+              [80, '#00a8de'],
+              [100, '#24edff'],
+              [125, '#24edff'],
+              [300, '#24edff'],
             ],
           },
           //    从source 'height'属性获取填充-挤出-高度。
-          "fill-extrusion-height": ["get", "height_3"],
-          "fill-extrusion-opacity": 1,
+          'fill-extrusion-height': ['get', 'height_3'],
+          'fill-extrusion-opacity': 1,
         },
       });
     };
     //添加延安水系
     const addYanAnRiverFlow = () => {
       let layer = new mapboxL7.LineLayer({
-        name: "waterLake",
+        name: 'waterLake',
       })
         .source(yanAnWater)
         .size(4)
-        .shape("line")
-        .texture("arrow")
-        .color("aqua")
+        .shape('line')
+        .texture('arrow')
+        .color('aqua')
         .animate({
           interval: 2, // 间隔
           duration: 3, // 持续时间，延时
@@ -632,19 +527,19 @@
           lineTexture: true, // 开启线的贴图功能
           iconStep: 200, // 设置贴图纹理的间距
           borderWidth: 0.4, // 默认文 0，最大有效值为 0.5
-          borderColor: "#fff", // 默认为 #ccc
+          borderColor: '#fff', // 默认为 #ccc
         });
       newfiberMapbox.addLayer(layer);
     };
     //添加延安路网
     const addYanAnRoad = () => {
       let layer = new mapboxL7.LineLayer({
-        name: "dynamicRoad",
+        name: 'dynamicRoad',
       })
         .source(yanAnRoad)
         .size(1.3)
-        .shape("line")
-        .color("rgb(184, 184, 184)")
+        .shape('line')
+        .color('rgb(184, 184, 184)')
         .animate({
           interval: 1, // 间隔
           duration: 1.5, // 持续时间，延时
@@ -657,26 +552,26 @@
     };
     onMounted(() => {
       initeMap();
-      bus.on("beansToMap", beansToMap);
-      bus.on("setLayerVisible", setLayerVisible);
-      bus.on("setLegendData", setLegendData);
-      bus.on("setGeoJSON", setGeoJSON);
-      bus.on("getGeojsonByType", getGeojsonByType);
-      bus.on("removeLayers", removeLayers);
-      bus.on("removeMapDatas", removeMapDatas);
-      bus.on("setHighlight", setHighlight);
-      bus.on("updateStyle", updateStyle);
+      bus.on('beansToMap', beansToMap);
+      bus.on('setLayerVisible', setLayerVisible);
+      bus.on('setLegendData', setLegendData);
+      bus.on('setGeoJSON', setGeoJSON);
+      bus.on('getGeojsonByType', getGeojsonByType);
+      bus.on('removeLayers', removeLayers);
+      bus.on('removeMapDatas', removeMapDatas);
+      bus.on('setHighlight', setHighlight);
+      bus.on('updateStyle', updateStyle);
     });
 
     onBeforeUnmount(() => {
-      bus.off("beansToMap");
-      bus.off("setLayerVisible");
-      bus.off("setLegendData");
-      bus.off("setGeoJSON");
-      bus.off("getGeojsonByType");
-      bus.off("removeMapDatas");
-      bus.off("setHighlight");
-      bus.off("updateStyle");
+      bus.off('beansToMap');
+      bus.off('setLayerVisible');
+      bus.off('setLegendData');
+      bus.off('setGeoJSON');
+      bus.off('getGeojsonByType');
+      bus.off('removeMapDatas');
+      bus.off('setHighlight');
+      bus.off('updateStyle');
       if (newfiberMapbox) {
         newfiberMapbox.destroy();
         newfiberMapbox = null;