diff --git a/src/components/Map/popup.vue b/src/components/Map/popup.vue
index 0c99a30..5e3d732 100644
--- a/src/components/Map/popup.vue
+++ b/src/components/Map/popup.vue
@@ -85,7 +85,7 @@
       AllData.dataList.rainpump = JSON.parse(AllData.dataList.rainpump);
       AllData.dataList.sweagepump = JSON.parse(AllData.dataList.sweagepump);
     }
-    AllData.dataList.geometry =  `POINT(${params.point.join(' ')})`
+    AllData.dataList.geometry = `POINT(${params.point.join(" ")})`;
     window.pipePopup = new mapboxL7.Popup({
       html: pipePopupDiv,
       lngLat: {
@@ -124,7 +124,11 @@
 });
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
+.l7-popup-close-button {
+  right: 32px !important;
+  top: 32px !important;
+}
 .cesiumPopup {
   width: 100%;
   height: 100%;

diff --git a/src/components/Map/popup.vue b/src/components/Map/popup.vue
index 0c99a30..5e3d732 100644
--- a/src/components/Map/popup.vue
+++ b/src/components/Map/popup.vue
@@ -85,7 +85,7 @@
       AllData.dataList.rainpump = JSON.parse(AllData.dataList.rainpump);
       AllData.dataList.sweagepump = JSON.parse(AllData.dataList.sweagepump);
     }
-    AllData.dataList.geometry =  `POINT(${params.point.join(' ')})`
+    AllData.dataList.geometry = `POINT(${params.point.join(" ")})`;
     window.pipePopup = new mapboxL7.Popup({
       html: pipePopupDiv,
       lngLat: {
@@ -124,7 +124,11 @@
 });
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
+.l7-popup-close-button {
+  right: 32px !important;
+  top: 32px !important;
+}
 .cesiumPopup {
   width: 100%;
   height: 100%;
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index 9c9d27e..bb2e956 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -9,15 +9,28 @@
       clearable
       @change="selectchange"
     >
-      <el-option v-for="(item, index) in filterList" :key="item.id + index + item.id" :label="item.name" :value="item.geometry">
-        <el-popover v-if="item.name.length >= 15" placement="top-start" width="300" trigger="hover" popper-class="popperclass">
+      <el-option
+        v-for="(item, index) in filterList"
+        :key="item.id + index + item.id"
+        :label="item.name"
+        :value="item.geometry"
+      >
+        <el-popover
+          v-if="item.name.length >= 15"
+          placement="top-start"
+          width="300"
+          trigger="hover"
+          popper-class="popperclass"
+        >
           <span>{{ item.name }}</span>
           <template #reference>
-            {{ item.name.slice(0, 15) + '...' }}
+            {{ item.name.slice(0, 15) + "..." }}
           </template>
         </el-popover>
         <span v-else>{{ item.name }}</span>
-        <span style="float: right; color: var(--el-text-color-secondary); font-size: 13px">
+        <span
+          style="float: right; color: var(--el-text-color-secondary); font-size: 13px"
+        >
           {{ item.pointTypeName }}
         </span>
       </el-option>
@@ -25,8 +38,8 @@
   </div>
 </template>
 <script setup>
-import bus from '@/bus/';
-import useUserStore from '@/store/modules/user';
+import bus from "@/bus/";
+import useUserStore from "@/store/modules/user";
 const appStore = useUserStore();
 const { proxy } = getCurrentInstance();
 const Show = ref(true);
@@ -40,7 +53,7 @@
 const number = ref(1);
 const SelectList = ref(1);
 const filterList = ref([]);
-const selectmodel = ref('');
+const selectmodel = ref("");
 const getItem = ref({});
 watch(
   () => appStore.MapData,
@@ -58,24 +71,27 @@
 
 function GetSearchList() {
   SelectList.value = [];
-  appStore.MapData.map(item => {
+  appStore.MapData.map((item) => {
     SelectList.value = SelectList.value.concat(item.data);
   });
   // console.log('MapData', appStore.MapData, SelectList.value);
   filterList.value = JSON.parse(JSON.stringify(SelectList.value));
-  debugger;
+  // debugger;
 }
 
 // 值改变后的操作
 function selectchange(value) {
-  if(value){
+  if (value) {
     let feature = turf.feature(Terraformer.WKT.parse(value));
-    bus.emit('setHighlight',feature);
-    newfiberMap.map.easeTo({center:turf.getCoords(turf.center(feature)),zoom:15});
-    busEmit(events_params.setGeoJSON.key, { json: turf.featureCollection([feature]), key: 'clickPoint' });
+    bus.emit("setHighlight", feature);
+    newfiberMap.map.easeTo({ center: turf.getCoords(turf.center(feature)), zoom: 15 });
+    busEmit(events_params.setGeoJSON.key, {
+      json: turf.featureCollection([feature]),
+      key: "clickPoint",
+    });
   }
 
-/*  if (value) {
+  /*  if (value) {
     // 选中的操作
     let arr = SelectList.value.filter(item => {
       return item.geometry == value;
@@ -91,18 +107,29 @@
 }
 const filterMethod = _.debounce((value) => {
   if (value) {
-    filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if(filterList.value.length == 0) bus.emit('geoRegeo',{name:value,callback:(results)=>{
-        filterList.value = results.geocodes.map((i,idx) => ({id:idx,name:i.formatted_address,geometry:`POINT(${gcoord.transform(i.location.split(','),gcoord.AMap,gcoord.WGS84).join(' ')})`,pointTypeName:"POI"}))
-      }})
+    filterList.value = SelectList.value.filter((item) => item.name.includes(value));
+    if (filterList.value.length == 0)
+      bus.emit("geoRegeo", {
+        name: value,
+        callback: (results) => {
+          filterList.value = results.geocodes.map((i, idx) => ({
+            id: idx,
+            name: i.formatted_address,
+            geometry: `POINT(${gcoord
+              .transform(i.location.split(","), gcoord.AMap, gcoord.WGS84)
+              .join(" ")})`,
+            pointTypeName: "POI",
+          }));
+        },
+      });
   } else {
     filterList.value = SelectList.value;
   }
-},500)
+}, 500);
 
 onMounted(() => {
-  bus.on('YQ_head', val => {
-    console.log('appStore.MapData',appStore.MapData);
+  bus.on("YQ_head", (val) => {
+    console.log("appStore.MapData", appStore.MapData);
     if (val == false) {
       Show.value = false;
     } else {
@@ -112,7 +139,7 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off('YQ_head');
+  bus.off("YQ_head");
 });
 </script>
 <style lang="scss" scoped>

diff --git a/src/components/Map/popup.vue b/src/components/Map/popup.vue
index 0c99a30..5e3d732 100644
--- a/src/components/Map/popup.vue
+++ b/src/components/Map/popup.vue
@@ -85,7 +85,7 @@
       AllData.dataList.rainpump = JSON.parse(AllData.dataList.rainpump);
       AllData.dataList.sweagepump = JSON.parse(AllData.dataList.sweagepump);
     }
-    AllData.dataList.geometry =  `POINT(${params.point.join(' ')})`
+    AllData.dataList.geometry = `POINT(${params.point.join(" ")})`;
     window.pipePopup = new mapboxL7.Popup({
       html: pipePopupDiv,
       lngLat: {
@@ -124,7 +124,11 @@
 });
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
+.l7-popup-close-button {
+  right: 32px !important;
+  top: 32px !important;
+}
 .cesiumPopup {
   width: 100%;
   height: 100%;
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index 9c9d27e..bb2e956 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -9,15 +9,28 @@
       clearable
       @change="selectchange"
     >
-      <el-option v-for="(item, index) in filterList" :key="item.id + index + item.id" :label="item.name" :value="item.geometry">
-        <el-popover v-if="item.name.length >= 15" placement="top-start" width="300" trigger="hover" popper-class="popperclass">
+      <el-option
+        v-for="(item, index) in filterList"
+        :key="item.id + index + item.id"
+        :label="item.name"
+        :value="item.geometry"
+      >
+        <el-popover
+          v-if="item.name.length >= 15"
+          placement="top-start"
+          width="300"
+          trigger="hover"
+          popper-class="popperclass"
+        >
           <span>{{ item.name }}</span>
           <template #reference>
-            {{ item.name.slice(0, 15) + '...' }}
+            {{ item.name.slice(0, 15) + "..." }}
           </template>
         </el-popover>
         <span v-else>{{ item.name }}</span>
-        <span style="float: right; color: var(--el-text-color-secondary); font-size: 13px">
+        <span
+          style="float: right; color: var(--el-text-color-secondary); font-size: 13px"
+        >
           {{ item.pointTypeName }}
         </span>
       </el-option>
@@ -25,8 +38,8 @@
   </div>
 </template>
 <script setup>
-import bus from '@/bus/';
-import useUserStore from '@/store/modules/user';
+import bus from "@/bus/";
+import useUserStore from "@/store/modules/user";
 const appStore = useUserStore();
 const { proxy } = getCurrentInstance();
 const Show = ref(true);
@@ -40,7 +53,7 @@
 const number = ref(1);
 const SelectList = ref(1);
 const filterList = ref([]);
-const selectmodel = ref('');
+const selectmodel = ref("");
 const getItem = ref({});
 watch(
   () => appStore.MapData,
@@ -58,24 +71,27 @@
 
 function GetSearchList() {
   SelectList.value = [];
-  appStore.MapData.map(item => {
+  appStore.MapData.map((item) => {
     SelectList.value = SelectList.value.concat(item.data);
   });
   // console.log('MapData', appStore.MapData, SelectList.value);
   filterList.value = JSON.parse(JSON.stringify(SelectList.value));
-  debugger;
+  // debugger;
 }
 
 // 值改变后的操作
 function selectchange(value) {
-  if(value){
+  if (value) {
     let feature = turf.feature(Terraformer.WKT.parse(value));
-    bus.emit('setHighlight',feature);
-    newfiberMap.map.easeTo({center:turf.getCoords(turf.center(feature)),zoom:15});
-    busEmit(events_params.setGeoJSON.key, { json: turf.featureCollection([feature]), key: 'clickPoint' });
+    bus.emit("setHighlight", feature);
+    newfiberMap.map.easeTo({ center: turf.getCoords(turf.center(feature)), zoom: 15 });
+    busEmit(events_params.setGeoJSON.key, {
+      json: turf.featureCollection([feature]),
+      key: "clickPoint",
+    });
   }
 
-/*  if (value) {
+  /*  if (value) {
     // 选中的操作
     let arr = SelectList.value.filter(item => {
       return item.geometry == value;
@@ -91,18 +107,29 @@
 }
 const filterMethod = _.debounce((value) => {
   if (value) {
-    filterList.value = SelectList.value.filter(item => item.name.includes(value));
-    if(filterList.value.length == 0) bus.emit('geoRegeo',{name:value,callback:(results)=>{
-        filterList.value = results.geocodes.map((i,idx) => ({id:idx,name:i.formatted_address,geometry:`POINT(${gcoord.transform(i.location.split(','),gcoord.AMap,gcoord.WGS84).join(' ')})`,pointTypeName:"POI"}))
-      }})
+    filterList.value = SelectList.value.filter((item) => item.name.includes(value));
+    if (filterList.value.length == 0)
+      bus.emit("geoRegeo", {
+        name: value,
+        callback: (results) => {
+          filterList.value = results.geocodes.map((i, idx) => ({
+            id: idx,
+            name: i.formatted_address,
+            geometry: `POINT(${gcoord
+              .transform(i.location.split(","), gcoord.AMap, gcoord.WGS84)
+              .join(" ")})`,
+            pointTypeName: "POI",
+          }));
+        },
+      });
   } else {
     filterList.value = SelectList.value;
   }
-},500)
+}, 500);
 
 onMounted(() => {
-  bus.on('YQ_head', val => {
-    console.log('appStore.MapData',appStore.MapData);
+  bus.on("YQ_head", (val) => {
+    console.log("appStore.MapData", appStore.MapData);
     if (val == false) {
       Show.value = false;
     } else {
@@ -112,7 +139,7 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off('YQ_head');
+  bus.off("YQ_head");
 });
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/pictureOnMap/page/DrainageSystem/index.vue b/src/views/pictureOnMap/page/DrainageSystem/index.vue
index 7f0a106..0bd18bd 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/index.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/index.vue
@@ -17,9 +17,9 @@
 </template>
 
 <script setup name="DrainageSystem">
-  import {ref, reactive, toRefs, onMounted, onBeforeUnmount} from "vue";
+import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from "vue";
 import bus from "@/bus";
-  import YSIndex from "./YSIndex.vue";
+import YSIndex from "./YSIndex.vue";
 // 引入接口
 import * as MonitorAPI from "@/api/MonitoringAnalysis.js";
 // 引入echarts组件
@@ -38,23 +38,27 @@
 
 const AllData = reactive({
   yw_type: [
-    { name: "污水体系", key: "sewage",
-      values: [
-        {key: "污水分区", visible: true},
-        {key: "尾水路径", visible: true},
-      ]},
     {
-      name: "雨水体系", key: "rain",
+      name: "污水体系",
+      key: "sewage",
       values: [
-        {key: "雨水分区", visible: true},
-        {key: "newfiber-XYZLayer", visible: true},
-        {key: "高清地图", visible: true},
-        {key: "rain_water_pump_station_info", visible: true},
-        {key: "outlet_info2", visible: false},
-        {key: "排口流向", visible: false},
-        {key: "排口流向1", visible: false},
-        {key: "rainwater_pipeline_quality1", visible: false}
-      ]
+        { key: "污水分区", visible: true },
+        { key: "尾水路径", visible: true },
+      ],
+    },
+    {
+      name: "雨水体系",
+      key: "rain",
+      values: [
+        { key: "雨水分区", visible: true },
+        { key: "newfiber-XYZLayer", visible: true },
+        { key: "高清地图", visible: true },
+        { key: "rain_water_pump_station_info", visible: true },
+        { key: "outlet_info2", visible: false },
+        { key: "排口流向", visible: false },
+        { key: "排口流向1", visible: false },
+        { key: "rainwater_pipeline_quality1", visible: false },
+      ],
     },
   ],
 });
@@ -63,12 +67,15 @@
   TypeClick_(item);
   AllData.TypeID = item.key;
 };
-const TypeClick_ = (item)=>{
+const TypeClick_ = (item) => {
   closeAllLayer();
   bus.emit("clearTemporaryData");
   const { setLayerVisible } = events_params;
   newfiberMap.map.easeTo(newfiberMap.config_.params.init);
-  item.values && item.values.filter((i) => i.visible).forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true }));
+  item.values &&
+    item.values
+      .filter((i) => i.visible)
+      .forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: true }));
 };
 const events_params = {
   setHighlight: { key: "setHighlight" },
@@ -77,13 +84,31 @@
 };
 const closeAllLayer = () => {
   const { setLayerVisible, setHighlight } = events_params;
-  AllData.yw_type.map((i) => i.values).filter(Boolean).flat().forEach((i) => bus.emit(setLayerVisible.key, { layername: i.key, isCheck: false,values:i.values }));
+  AllData.yw_type
+    .map((i) => i.values)
+    .filter(Boolean)
+    .flat()
+    .forEach((i) =>
+      bus.emit(setLayerVisible.key, {
+        layername: i.key,
+        isCheck: false,
+        values: i.values,
+      })
+    );
   bus.emit(setHighlight.key, []);
 };
 
 onMounted(() => {
+  let initeGLTimer = setInterval(() => {
+    if (!newfiberMap) return;
+    TypeClick(AllData.yw_type[1]);
 
-  bus.on(mapInitBusName, () => TypeClick(AllData.yw_type.filter((i) => i.key == AllData.TypeID)[0]));
+    clearInterval(initeGLTimer);
+  }, 100);
+
+  bus.on(mapInitBusName, () =>
+    TypeClick(AllData.yw_type.filter((i) => i.key == AllData.TypeID)[0])
+  );
 });
 
 onBeforeUnmount(() => {