diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index e3eac7a..234bea5 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -253,7 +253,6 @@
       // });
       // 遍历模型中的所有网格
       gltf.scene.traverse((child) => {
-        console.log(child);
         if (child.name == "立方体1" || child.name == "立方体2") {
           // 修改或替换材质
           // child.material = new THREE.MeshBasicMaterial({ color: 0x545d0c}); // 将材质替换为红色基本材质

diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index e3eac7a..234bea5 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -253,7 +253,6 @@
       // });
       // 遍历模型中的所有网格
       gltf.scene.traverse((child) => {
-        console.log(child);
         if (child.name == "立方体1" || child.name == "立方体2") {
           // 修改或替换材质
           // child.material = new THREE.MeshBasicMaterial({ color: 0x545d0c}); // 将材质替换为红色基本材质
diff --git a/src/views/oneMap/OverallOverview/RightBox.vue b/src/views/oneMap/OverallOverview/RightBox.vue
index aa2ee6e..7764407 100644
--- a/src/views/oneMap/OverallOverview/RightBox.vue
+++ b/src/views/oneMap/OverallOverview/RightBox.vue
@@ -62,7 +62,14 @@
               {{ item.num }}
             </div>
 
-            <div style="font-family: Source Han Sans CN; font-weight: bold; font-size: 13px; color: #00b8f7">
+            <div
+              style="
+                font-family: Source Han Sans CN;
+                font-weight: bold;
+                font-size: 13px;
+                color: #00b8f7;
+              "
+            >
               {{ item.dw }}
             </div>
           </div>
@@ -127,7 +134,12 @@
                 <div
                   class="oflower"
                   :style="{
-                    color: item.gm == '较多' ? '#FF4D5DFF' : item.gm == '正常' ? '#2BE7ABFF' : '#F8E270FF',
+                    color:
+                      item.gm == '较多'
+                        ? '#FF4D5DFF'
+                        : item.gm == '正常'
+                        ? '#2BE7ABFF'
+                        : '#F8E270FF',
                   }"
                 >
                   {{ item.gm }}
@@ -139,49 +151,52 @@
       </div>
     </div>
     <div class="WarningEcharts">
-      <AssessmentjsEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentjsEcharts>
+      <AssessmentjsEcharts
+        :data="chartData2"
+        :refresh="chartData2.refresh"
+      ></AssessmentjsEcharts>
     </div>
   </div>
 </template>
 
 <script setup>
-import tslyqk_constituent_3d from '@/views/oneMap/Echarts/tslyqk_constituent_3d.vue'; //3d图例
-import AssessmentjsEcharts from '@/views/oneMap/Echarts/AssessmentjsEcharts.vue';
+import tslyqk_constituent_3d from "@/views/oneMap/Echarts/tslyqk_constituent_3d.vue"; //3d图例
+import AssessmentjsEcharts from "@/views/oneMap/Echarts/AssessmentjsEcharts.vue";
 
-import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from 'vue';
+import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from "vue";
 const AllData = reactive({});
-import yjsj from '@/assets/newImgs/yjsj.png'; //预警数据
-import czsj from '@/assets/newImgs/czsj.png'; //处置数据
-import czl from '@/assets/newImgs/czl.png'; //处置率
+import yjsj from "@/assets/newImgs/yjsj.png"; //预警数据
+import czsj from "@/assets/newImgs/czsj.png"; //处置数据
+import czl from "@/assets/newImgs/czl.png"; //处置率
 
-import ranqi_icon from '@/assets/newImgs/ranqi_icon.png'; //燃气
-import qiaoliang from '@/assets/newImgs/qiaoliang.png'; //桥梁
-import sd_icon from '@/assets/newImgs/sd_icon.png'; //隧道
-import ps_icon from '@/assets/newImgs/ps_icon.png'; //隧道
-import fxzb from '@/assets/newImgs/fxzb.png'; //风险占比
-import bus from '@/bus';
-import mapBoxVectorLayer from '@/utils/GISdocument/mapboxVectorLayer.js';
+import ranqi_icon from "@/assets/newImgs/ranqi_icon.png"; //燃气
+import qiaoliang from "@/assets/newImgs/qiaoliang.png"; //桥梁
+import sd_icon from "@/assets/newImgs/sd_icon.png"; //隧道
+import ps_icon from "@/assets/newImgs/ps_icon.png"; //隧道
+import fxzb from "@/assets/newImgs/fxzb.png"; //风险占比
+import bus from "@/bus";
+import mapBoxVectorLayer from "@/utils/GISdocument/mapboxVectorLayer.js";
 const yearList = ref([
-  { name: '月', value: 1 },
-  { name: '年', value: 2 },
+  { name: "月", value: 1 },
+  { name: "年", value: 2 },
 ]);
 const chartData2 = ref({
-  xAxis: ['12/1', '12/2', '12/3', '12/4', '12/5', '12/6'],
+  xAxis: ["12/1", "12/2", "12/3", "12/4", "12/5", "12/6"],
   refresh: 1,
 });
 const riskData = ref([
-  { name: '燃气', num: 4549.53, sl: 1922.11, Imgurl: ranqi_icon, dw: '公里' },
-  { name: '排水', num: 435.7, sl: 118, Imgurl: ps_icon, dw: '公里' },
-  { name: '桥梁', num: 84, sl: 0, Imgurl: qiaoliang, dw: '座' },
-  { name: '隧道', num: 1, sl: 0, Imgurl: sd_icon, dw: '座' },
+  { name: "燃气", num: 4979.88, sl: 149, Imgurl: ranqi_icon, dw: "公里" },
+  { name: "排水", num: 435.7, sl: 118, Imgurl: ps_icon, dw: "公里" },
+  { name: "桥梁", num: 84, sl: 0, Imgurl: qiaoliang, dw: "座" },
+  { name: "隧道", num: 1, sl: 0, Imgurl: sd_icon, dw: "座" },
 ]);
 const tableData = ref([
-  { name: '预警数量', num: '60', gm: '较多', Imgurl: yjsj },
-  { name: '处置数量', num: '60', gm: '正常', Imgurl: czsj },
-  { name: '处置率', num: '75%', gm: '未完成', Imgurl: czl },
+  { name: "预警数量", num: "60", gm: "较多", Imgurl: yjsj },
+  { name: "处置数量", num: "60", gm: "正常", Imgurl: czsj },
+  { name: "处置率", num: "75%", gm: "未完成", Imgurl: czl },
 ]);
 
-const activedname = ref('月');
+const activedname = ref("月");
 function yearclick(val) {
   activedname.value = val.name;
 }
@@ -195,145 +210,145 @@
 };
 
 // 风险评估点击事件
-const FxClickName = ref('燃气');
+const FxClickName = ref("燃气");
 const obj = ref([
   {
-    name: '低风险  70%  1345.5',
+    name: "低风险  70%  1345.5",
     value: 1345.5,
     itemStyle: {
-      color: '#2BE7ABFF',
+      color: "#2BE7ABFF",
     },
   },
   {
-    name: '一般风险 20%  384.5',
+    name: "一般风险 20%  384.5",
     value: 384.5,
     itemStyle: {
-      color: '#18A7F2FF',
+      color: "#18A7F2FF",
     },
   },
   {
-    name: '较大风险 5%  91.11',
+    name: "较大风险 5%  91.11",
     value: 91.11,
     itemStyle: {
-      color: '#F8E270FF',
+      color: "#F8E270FF",
     },
   },
   {
-    name: '重大风险 5%  91',
+    name: "重大风险 5%  91",
     value: 91,
     itemStyle: {
-      color: '#FF5D6CFF',
+      color: "#FF5D6CFF",
     },
   },
 ]);
 
 function FxClick(val) {
   FxClickName.value = val;
-  if (FxClickName.value == '燃气') {
+  if (FxClickName.value == "燃气") {
     let obj = [
       {
-        name: '低风险  70%  1345.5',
+        name: "低风险  70%  1345.5",
         value: 1345.5,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险 20%  384.5',
+        name: "一般风险 20%  384.5",
         value: 384.5,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险 5%  91.11',
+        name: "较大风险 5%  91.11",
         value: 91.11,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险 5%  91',
+        name: "重大风险 5%  91",
         value: 91,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
 
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['燃气风险评估']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["燃气风险评估"]);
     // bus.emit("SiSeTuBol", true);
-    bus.emit('SetLayerShow', ['燃气视角']);
-  } else if (FxClickName.value == '排水') {
+    bus.emit("SetLayerShow", ["燃气视角"]);
+  } else if (FxClickName.value == "排水") {
     let obj = [
       {
-        name: '低风险  65%  76.7',
+        name: "低风险  65%  76.7",
         value: 76.7,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险 20%  23.6',
+        name: "一般风险 20%  23.6",
         value: 23.6,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险 10%  11.8',
+        name: "较大风险 10%  11.8",
         value: 11.8,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险 5%  5.9',
+        name: "重大风险 5%  5.9",
         value: 5.9,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
 
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['排水风险评估', '综合视角']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["排水风险评估", "综合视角"]);
     // bus.emit("SiSeTuBol", true);
-  } else if (FxClickName.value == '桥梁') {
+  } else if (FxClickName.value == "桥梁") {
     let obj = [
       {
-        name: '低风险  0%  0',
+        name: "低风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险  0%  0',
+        name: "一般风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险  0%  0',
+        name: "较大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险  0%  0',
+        name: "重大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
     let heatMapList = [
       { lonlat: [109.483918489923, 36.61249884561792], value: 2 },
       { lonlat: [109.49124949683474, 36.60775434074279], value: 2 },
@@ -389,54 +404,54 @@
     ];
     let heatMapJeojson = {};
     let heatMapFeatures = [];
-    heatMapList.forEach(element => {
+    heatMapList.forEach((element) => {
       let heatmap = turf.point(element.lonlat);
       heatmap.properties.value = element.value;
       gcoord.transform(heatmap, gcoord.BD09, gcoord.WGS84);
       heatMapFeatures.push(heatmap);
     });
     heatMapJeojson = turf.featureCollection(heatMapFeatures);
-    mapBoxVectorLayer.removeByIds(['heatMapLayer']);
-    mapBoxVectorLayer.addHeatMapLayer('heatMapLayer', heatMapJeojson, 'value');
-    heatMapJeojson.features.forEach(feature => {
+    mapBoxVectorLayer.removeByIds(["heatMapLayer"]);
+    mapBoxVectorLayer.addHeatMapLayer("heatMapLayer", heatMapJeojson, "value");
+    heatMapJeojson.features.forEach((feature) => {
       gcoord.transform(feature, gcoord.WGS84, gcoord.BD09);
     });
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['仿真地图', '桥梁视角']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["仿真地图", "桥梁视角"]);
   } else {
     let obj = [
       {
-        name: '低风险  0%  0',
+        name: "低风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险  0%  0',
+        name: "一般风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险  0%  0',
+        name: "较大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险  0%  0',
+        name: "重大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['仿真地图', '隧道视角']);
+    bus.emit("FxVisible", obj);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["仿真地图", "隧道视角"]);
   }
 }
 
@@ -455,10 +470,10 @@
   { immediate: true }
 );
 onMounted(() => {
-  bus.emit('FxVisible', obj.value);
+  bus.emit("FxVisible", obj.value);
 });
 onBeforeUnmount(() => {
-  mapBoxVectorLayer.removeByIds(['heatMapLayer']);
+  mapBoxVectorLayer.removeByIds(["heatMapLayer"]);
 });
 </script>
 
@@ -495,7 +510,11 @@
           height: 14px;
           width: 58%;
           margin-top: 8px;
-          background: linear-gradient(0deg, rgba(0, 43, 67, 0.8) 0%, rgba(0, 76, 118, 0.8) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(0, 43, 67, 0.8) 0%,
+            rgba(0, 76, 118, 0.8) 100%
+          );
           border-radius: 16px;
           // border: 1px solid #00B8F7;
           // background: yellow;
@@ -546,7 +565,7 @@
         .part {
           width: 130px;
           height: 160px;
-          background: url('@/assets/newImgs/iSpt.png') no-repeat;
+          background: url("@/assets/newImgs/iSpt.png") no-repeat;
           background-size: 100% 100%;
           .parttop {
             height: 160px;
@@ -614,7 +633,7 @@
   position: relative;
   width: 408px;
   height: 44px;
-  background: url('@/assets/newImgs/partBg.png') no-repeat;
+  background: url("@/assets/newImgs/partBg.png") no-repeat;
   background-size: 100% 100%;
   font-family: PangMenZhengDao;
   font-weight: 400;
@@ -634,7 +653,7 @@
       margin-left: 5px;
       width: 25px;
       height: 25px;
-      background: url('@/assets/newImgs/xtb_img.png') no-repeat;
+      background: url("@/assets/newImgs/xtb_img.png") no-repeat;
     }
     .text {
       font-family: Source Han Sans CN;
@@ -648,7 +667,11 @@
       //   rgba(0, 242, 255, 0.5) 0%,
       //   rgba(0, 242, 255, 0) 100%
       // );
-      background: linear-gradient(0deg, rgba(28, 138, 255, 0.5) 0%, rgba(28, 138, 255, 0) 100%);
+      background: linear-gradient(
+        0deg,
+        rgba(28, 138, 255, 0.5) 0%,
+        rgba(28, 138, 255, 0) 100%
+      );
       height: 10px;
       line-height: 0px;
       margin-top: 10px;
@@ -750,7 +773,7 @@
   height: 44px;
   line-height: 50px;
   width: 98%;
-  background: url('@/assets/newImgs/partBg.png') no-repeat;
+  background: url("@/assets/newImgs/partBg.png") no-repeat;
   background-size: 100% 100%;
   display: flex;
   align-items: center;

diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index e3eac7a..234bea5 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -253,7 +253,6 @@
       // });
       // 遍历模型中的所有网格
       gltf.scene.traverse((child) => {
-        console.log(child);
         if (child.name == "立方体1" || child.name == "立方体2") {
           // 修改或替换材质
           // child.material = new THREE.MeshBasicMaterial({ color: 0x545d0c}); // 将材质替换为红色基本材质
diff --git a/src/views/oneMap/OverallOverview/RightBox.vue b/src/views/oneMap/OverallOverview/RightBox.vue
index aa2ee6e..7764407 100644
--- a/src/views/oneMap/OverallOverview/RightBox.vue
+++ b/src/views/oneMap/OverallOverview/RightBox.vue
@@ -62,7 +62,14 @@
               {{ item.num }}
             </div>
 
-            <div style="font-family: Source Han Sans CN; font-weight: bold; font-size: 13px; color: #00b8f7">
+            <div
+              style="
+                font-family: Source Han Sans CN;
+                font-weight: bold;
+                font-size: 13px;
+                color: #00b8f7;
+              "
+            >
               {{ item.dw }}
             </div>
           </div>
@@ -127,7 +134,12 @@
                 <div
                   class="oflower"
                   :style="{
-                    color: item.gm == '较多' ? '#FF4D5DFF' : item.gm == '正常' ? '#2BE7ABFF' : '#F8E270FF',
+                    color:
+                      item.gm == '较多'
+                        ? '#FF4D5DFF'
+                        : item.gm == '正常'
+                        ? '#2BE7ABFF'
+                        : '#F8E270FF',
                   }"
                 >
                   {{ item.gm }}
@@ -139,49 +151,52 @@
       </div>
     </div>
     <div class="WarningEcharts">
-      <AssessmentjsEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentjsEcharts>
+      <AssessmentjsEcharts
+        :data="chartData2"
+        :refresh="chartData2.refresh"
+      ></AssessmentjsEcharts>
     </div>
   </div>
 </template>
 
 <script setup>
-import tslyqk_constituent_3d from '@/views/oneMap/Echarts/tslyqk_constituent_3d.vue'; //3d图例
-import AssessmentjsEcharts from '@/views/oneMap/Echarts/AssessmentjsEcharts.vue';
+import tslyqk_constituent_3d from "@/views/oneMap/Echarts/tslyqk_constituent_3d.vue"; //3d图例
+import AssessmentjsEcharts from "@/views/oneMap/Echarts/AssessmentjsEcharts.vue";
 
-import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from 'vue';
+import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from "vue";
 const AllData = reactive({});
-import yjsj from '@/assets/newImgs/yjsj.png'; //预警数据
-import czsj from '@/assets/newImgs/czsj.png'; //处置数据
-import czl from '@/assets/newImgs/czl.png'; //处置率
+import yjsj from "@/assets/newImgs/yjsj.png"; //预警数据
+import czsj from "@/assets/newImgs/czsj.png"; //处置数据
+import czl from "@/assets/newImgs/czl.png"; //处置率
 
-import ranqi_icon from '@/assets/newImgs/ranqi_icon.png'; //燃气
-import qiaoliang from '@/assets/newImgs/qiaoliang.png'; //桥梁
-import sd_icon from '@/assets/newImgs/sd_icon.png'; //隧道
-import ps_icon from '@/assets/newImgs/ps_icon.png'; //隧道
-import fxzb from '@/assets/newImgs/fxzb.png'; //风险占比
-import bus from '@/bus';
-import mapBoxVectorLayer from '@/utils/GISdocument/mapboxVectorLayer.js';
+import ranqi_icon from "@/assets/newImgs/ranqi_icon.png"; //燃气
+import qiaoliang from "@/assets/newImgs/qiaoliang.png"; //桥梁
+import sd_icon from "@/assets/newImgs/sd_icon.png"; //隧道
+import ps_icon from "@/assets/newImgs/ps_icon.png"; //隧道
+import fxzb from "@/assets/newImgs/fxzb.png"; //风险占比
+import bus from "@/bus";
+import mapBoxVectorLayer from "@/utils/GISdocument/mapboxVectorLayer.js";
 const yearList = ref([
-  { name: '月', value: 1 },
-  { name: '年', value: 2 },
+  { name: "月", value: 1 },
+  { name: "年", value: 2 },
 ]);
 const chartData2 = ref({
-  xAxis: ['12/1', '12/2', '12/3', '12/4', '12/5', '12/6'],
+  xAxis: ["12/1", "12/2", "12/3", "12/4", "12/5", "12/6"],
   refresh: 1,
 });
 const riskData = ref([
-  { name: '燃气', num: 4549.53, sl: 1922.11, Imgurl: ranqi_icon, dw: '公里' },
-  { name: '排水', num: 435.7, sl: 118, Imgurl: ps_icon, dw: '公里' },
-  { name: '桥梁', num: 84, sl: 0, Imgurl: qiaoliang, dw: '座' },
-  { name: '隧道', num: 1, sl: 0, Imgurl: sd_icon, dw: '座' },
+  { name: "燃气", num: 4979.88, sl: 149, Imgurl: ranqi_icon, dw: "公里" },
+  { name: "排水", num: 435.7, sl: 118, Imgurl: ps_icon, dw: "公里" },
+  { name: "桥梁", num: 84, sl: 0, Imgurl: qiaoliang, dw: "座" },
+  { name: "隧道", num: 1, sl: 0, Imgurl: sd_icon, dw: "座" },
 ]);
 const tableData = ref([
-  { name: '预警数量', num: '60', gm: '较多', Imgurl: yjsj },
-  { name: '处置数量', num: '60', gm: '正常', Imgurl: czsj },
-  { name: '处置率', num: '75%', gm: '未完成', Imgurl: czl },
+  { name: "预警数量", num: "60", gm: "较多", Imgurl: yjsj },
+  { name: "处置数量", num: "60", gm: "正常", Imgurl: czsj },
+  { name: "处置率", num: "75%", gm: "未完成", Imgurl: czl },
 ]);
 
-const activedname = ref('月');
+const activedname = ref("月");
 function yearclick(val) {
   activedname.value = val.name;
 }
@@ -195,145 +210,145 @@
 };
 
 // 风险评估点击事件
-const FxClickName = ref('燃气');
+const FxClickName = ref("燃气");
 const obj = ref([
   {
-    name: '低风险  70%  1345.5',
+    name: "低风险  70%  1345.5",
     value: 1345.5,
     itemStyle: {
-      color: '#2BE7ABFF',
+      color: "#2BE7ABFF",
     },
   },
   {
-    name: '一般风险 20%  384.5',
+    name: "一般风险 20%  384.5",
     value: 384.5,
     itemStyle: {
-      color: '#18A7F2FF',
+      color: "#18A7F2FF",
     },
   },
   {
-    name: '较大风险 5%  91.11',
+    name: "较大风险 5%  91.11",
     value: 91.11,
     itemStyle: {
-      color: '#F8E270FF',
+      color: "#F8E270FF",
     },
   },
   {
-    name: '重大风险 5%  91',
+    name: "重大风险 5%  91",
     value: 91,
     itemStyle: {
-      color: '#FF5D6CFF',
+      color: "#FF5D6CFF",
     },
   },
 ]);
 
 function FxClick(val) {
   FxClickName.value = val;
-  if (FxClickName.value == '燃气') {
+  if (FxClickName.value == "燃气") {
     let obj = [
       {
-        name: '低风险  70%  1345.5',
+        name: "低风险  70%  1345.5",
         value: 1345.5,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险 20%  384.5',
+        name: "一般风险 20%  384.5",
         value: 384.5,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险 5%  91.11',
+        name: "较大风险 5%  91.11",
         value: 91.11,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险 5%  91',
+        name: "重大风险 5%  91",
         value: 91,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
 
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['燃气风险评估']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["燃气风险评估"]);
     // bus.emit("SiSeTuBol", true);
-    bus.emit('SetLayerShow', ['燃气视角']);
-  } else if (FxClickName.value == '排水') {
+    bus.emit("SetLayerShow", ["燃气视角"]);
+  } else if (FxClickName.value == "排水") {
     let obj = [
       {
-        name: '低风险  65%  76.7',
+        name: "低风险  65%  76.7",
         value: 76.7,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险 20%  23.6',
+        name: "一般风险 20%  23.6",
         value: 23.6,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险 10%  11.8',
+        name: "较大风险 10%  11.8",
         value: 11.8,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险 5%  5.9',
+        name: "重大风险 5%  5.9",
         value: 5.9,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
 
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['排水风险评估', '综合视角']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["排水风险评估", "综合视角"]);
     // bus.emit("SiSeTuBol", true);
-  } else if (FxClickName.value == '桥梁') {
+  } else if (FxClickName.value == "桥梁") {
     let obj = [
       {
-        name: '低风险  0%  0',
+        name: "低风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险  0%  0',
+        name: "一般风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险  0%  0',
+        name: "较大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险  0%  0',
+        name: "重大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
     let heatMapList = [
       { lonlat: [109.483918489923, 36.61249884561792], value: 2 },
       { lonlat: [109.49124949683474, 36.60775434074279], value: 2 },
@@ -389,54 +404,54 @@
     ];
     let heatMapJeojson = {};
     let heatMapFeatures = [];
-    heatMapList.forEach(element => {
+    heatMapList.forEach((element) => {
       let heatmap = turf.point(element.lonlat);
       heatmap.properties.value = element.value;
       gcoord.transform(heatmap, gcoord.BD09, gcoord.WGS84);
       heatMapFeatures.push(heatmap);
     });
     heatMapJeojson = turf.featureCollection(heatMapFeatures);
-    mapBoxVectorLayer.removeByIds(['heatMapLayer']);
-    mapBoxVectorLayer.addHeatMapLayer('heatMapLayer', heatMapJeojson, 'value');
-    heatMapJeojson.features.forEach(feature => {
+    mapBoxVectorLayer.removeByIds(["heatMapLayer"]);
+    mapBoxVectorLayer.addHeatMapLayer("heatMapLayer", heatMapJeojson, "value");
+    heatMapJeojson.features.forEach((feature) => {
       gcoord.transform(feature, gcoord.WGS84, gcoord.BD09);
     });
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['仿真地图', '桥梁视角']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["仿真地图", "桥梁视角"]);
   } else {
     let obj = [
       {
-        name: '低风险  0%  0',
+        name: "低风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险  0%  0',
+        name: "一般风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险  0%  0',
+        name: "较大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险  0%  0',
+        name: "重大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['仿真地图', '隧道视角']);
+    bus.emit("FxVisible", obj);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["仿真地图", "隧道视角"]);
   }
 }
 
@@ -455,10 +470,10 @@
   { immediate: true }
 );
 onMounted(() => {
-  bus.emit('FxVisible', obj.value);
+  bus.emit("FxVisible", obj.value);
 });
 onBeforeUnmount(() => {
-  mapBoxVectorLayer.removeByIds(['heatMapLayer']);
+  mapBoxVectorLayer.removeByIds(["heatMapLayer"]);
 });
 </script>
 
@@ -495,7 +510,11 @@
           height: 14px;
           width: 58%;
           margin-top: 8px;
-          background: linear-gradient(0deg, rgba(0, 43, 67, 0.8) 0%, rgba(0, 76, 118, 0.8) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(0, 43, 67, 0.8) 0%,
+            rgba(0, 76, 118, 0.8) 100%
+          );
           border-radius: 16px;
           // border: 1px solid #00B8F7;
           // background: yellow;
@@ -546,7 +565,7 @@
         .part {
           width: 130px;
           height: 160px;
-          background: url('@/assets/newImgs/iSpt.png') no-repeat;
+          background: url("@/assets/newImgs/iSpt.png") no-repeat;
           background-size: 100% 100%;
           .parttop {
             height: 160px;
@@ -614,7 +633,7 @@
   position: relative;
   width: 408px;
   height: 44px;
-  background: url('@/assets/newImgs/partBg.png') no-repeat;
+  background: url("@/assets/newImgs/partBg.png") no-repeat;
   background-size: 100% 100%;
   font-family: PangMenZhengDao;
   font-weight: 400;
@@ -634,7 +653,7 @@
       margin-left: 5px;
       width: 25px;
       height: 25px;
-      background: url('@/assets/newImgs/xtb_img.png') no-repeat;
+      background: url("@/assets/newImgs/xtb_img.png") no-repeat;
     }
     .text {
       font-family: Source Han Sans CN;
@@ -648,7 +667,11 @@
       //   rgba(0, 242, 255, 0.5) 0%,
       //   rgba(0, 242, 255, 0) 100%
       // );
-      background: linear-gradient(0deg, rgba(28, 138, 255, 0.5) 0%, rgba(28, 138, 255, 0) 100%);
+      background: linear-gradient(
+        0deg,
+        rgba(28, 138, 255, 0.5) 0%,
+        rgba(28, 138, 255, 0) 100%
+      );
       height: 10px;
       line-height: 0px;
       margin-top: 10px;
@@ -750,7 +773,7 @@
   height: 44px;
   line-height: 50px;
   width: 98%;
-  background: url('@/assets/newImgs/partBg.png') no-repeat;
+  background: url("@/assets/newImgs/partBg.png") no-repeat;
   background-size: 100% 100%;
   display: flex;
   align-items: center;
diff --git a/src/views/oneMap/SmartDrainage/PsRightBox.vue b/src/views/oneMap/SmartDrainage/PsRightBox.vue
index 322cead..bcb4123 100644
--- a/src/views/oneMap/SmartDrainage/PsRightBox.vue
+++ b/src/views/oneMap/SmartDrainage/PsRightBox.vue
@@ -521,7 +521,9 @@
   getWaterlogging();
 });
 
-onBeforeUnmount(() => {});
+onBeforeUnmount(() => {
+  bus.emit("clearAllLayer");
+});
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index e3eac7a..234bea5 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -253,7 +253,6 @@
       // });
       // 遍历模型中的所有网格
       gltf.scene.traverse((child) => {
-        console.log(child);
         if (child.name == "立方体1" || child.name == "立方体2") {
           // 修改或替换材质
           // child.material = new THREE.MeshBasicMaterial({ color: 0x545d0c}); // 将材质替换为红色基本材质
diff --git a/src/views/oneMap/OverallOverview/RightBox.vue b/src/views/oneMap/OverallOverview/RightBox.vue
index aa2ee6e..7764407 100644
--- a/src/views/oneMap/OverallOverview/RightBox.vue
+++ b/src/views/oneMap/OverallOverview/RightBox.vue
@@ -62,7 +62,14 @@
               {{ item.num }}
             </div>
 
-            <div style="font-family: Source Han Sans CN; font-weight: bold; font-size: 13px; color: #00b8f7">
+            <div
+              style="
+                font-family: Source Han Sans CN;
+                font-weight: bold;
+                font-size: 13px;
+                color: #00b8f7;
+              "
+            >
               {{ item.dw }}
             </div>
           </div>
@@ -127,7 +134,12 @@
                 <div
                   class="oflower"
                   :style="{
-                    color: item.gm == '较多' ? '#FF4D5DFF' : item.gm == '正常' ? '#2BE7ABFF' : '#F8E270FF',
+                    color:
+                      item.gm == '较多'
+                        ? '#FF4D5DFF'
+                        : item.gm == '正常'
+                        ? '#2BE7ABFF'
+                        : '#F8E270FF',
                   }"
                 >
                   {{ item.gm }}
@@ -139,49 +151,52 @@
       </div>
     </div>
     <div class="WarningEcharts">
-      <AssessmentjsEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentjsEcharts>
+      <AssessmentjsEcharts
+        :data="chartData2"
+        :refresh="chartData2.refresh"
+      ></AssessmentjsEcharts>
     </div>
   </div>
 </template>
 
 <script setup>
-import tslyqk_constituent_3d from '@/views/oneMap/Echarts/tslyqk_constituent_3d.vue'; //3d图例
-import AssessmentjsEcharts from '@/views/oneMap/Echarts/AssessmentjsEcharts.vue';
+import tslyqk_constituent_3d from "@/views/oneMap/Echarts/tslyqk_constituent_3d.vue"; //3d图例
+import AssessmentjsEcharts from "@/views/oneMap/Echarts/AssessmentjsEcharts.vue";
 
-import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from 'vue';
+import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from "vue";
 const AllData = reactive({});
-import yjsj from '@/assets/newImgs/yjsj.png'; //预警数据
-import czsj from '@/assets/newImgs/czsj.png'; //处置数据
-import czl from '@/assets/newImgs/czl.png'; //处置率
+import yjsj from "@/assets/newImgs/yjsj.png"; //预警数据
+import czsj from "@/assets/newImgs/czsj.png"; //处置数据
+import czl from "@/assets/newImgs/czl.png"; //处置率
 
-import ranqi_icon from '@/assets/newImgs/ranqi_icon.png'; //燃气
-import qiaoliang from '@/assets/newImgs/qiaoliang.png'; //桥梁
-import sd_icon from '@/assets/newImgs/sd_icon.png'; //隧道
-import ps_icon from '@/assets/newImgs/ps_icon.png'; //隧道
-import fxzb from '@/assets/newImgs/fxzb.png'; //风险占比
-import bus from '@/bus';
-import mapBoxVectorLayer from '@/utils/GISdocument/mapboxVectorLayer.js';
+import ranqi_icon from "@/assets/newImgs/ranqi_icon.png"; //燃气
+import qiaoliang from "@/assets/newImgs/qiaoliang.png"; //桥梁
+import sd_icon from "@/assets/newImgs/sd_icon.png"; //隧道
+import ps_icon from "@/assets/newImgs/ps_icon.png"; //隧道
+import fxzb from "@/assets/newImgs/fxzb.png"; //风险占比
+import bus from "@/bus";
+import mapBoxVectorLayer from "@/utils/GISdocument/mapboxVectorLayer.js";
 const yearList = ref([
-  { name: '月', value: 1 },
-  { name: '年', value: 2 },
+  { name: "月", value: 1 },
+  { name: "年", value: 2 },
 ]);
 const chartData2 = ref({
-  xAxis: ['12/1', '12/2', '12/3', '12/4', '12/5', '12/6'],
+  xAxis: ["12/1", "12/2", "12/3", "12/4", "12/5", "12/6"],
   refresh: 1,
 });
 const riskData = ref([
-  { name: '燃气', num: 4549.53, sl: 1922.11, Imgurl: ranqi_icon, dw: '公里' },
-  { name: '排水', num: 435.7, sl: 118, Imgurl: ps_icon, dw: '公里' },
-  { name: '桥梁', num: 84, sl: 0, Imgurl: qiaoliang, dw: '座' },
-  { name: '隧道', num: 1, sl: 0, Imgurl: sd_icon, dw: '座' },
+  { name: "燃气", num: 4979.88, sl: 149, Imgurl: ranqi_icon, dw: "公里" },
+  { name: "排水", num: 435.7, sl: 118, Imgurl: ps_icon, dw: "公里" },
+  { name: "桥梁", num: 84, sl: 0, Imgurl: qiaoliang, dw: "座" },
+  { name: "隧道", num: 1, sl: 0, Imgurl: sd_icon, dw: "座" },
 ]);
 const tableData = ref([
-  { name: '预警数量', num: '60', gm: '较多', Imgurl: yjsj },
-  { name: '处置数量', num: '60', gm: '正常', Imgurl: czsj },
-  { name: '处置率', num: '75%', gm: '未完成', Imgurl: czl },
+  { name: "预警数量", num: "60", gm: "较多", Imgurl: yjsj },
+  { name: "处置数量", num: "60", gm: "正常", Imgurl: czsj },
+  { name: "处置率", num: "75%", gm: "未完成", Imgurl: czl },
 ]);
 
-const activedname = ref('月');
+const activedname = ref("月");
 function yearclick(val) {
   activedname.value = val.name;
 }
@@ -195,145 +210,145 @@
 };
 
 // 风险评估点击事件
-const FxClickName = ref('燃气');
+const FxClickName = ref("燃气");
 const obj = ref([
   {
-    name: '低风险  70%  1345.5',
+    name: "低风险  70%  1345.5",
     value: 1345.5,
     itemStyle: {
-      color: '#2BE7ABFF',
+      color: "#2BE7ABFF",
     },
   },
   {
-    name: '一般风险 20%  384.5',
+    name: "一般风险 20%  384.5",
     value: 384.5,
     itemStyle: {
-      color: '#18A7F2FF',
+      color: "#18A7F2FF",
     },
   },
   {
-    name: '较大风险 5%  91.11',
+    name: "较大风险 5%  91.11",
     value: 91.11,
     itemStyle: {
-      color: '#F8E270FF',
+      color: "#F8E270FF",
     },
   },
   {
-    name: '重大风险 5%  91',
+    name: "重大风险 5%  91",
     value: 91,
     itemStyle: {
-      color: '#FF5D6CFF',
+      color: "#FF5D6CFF",
     },
   },
 ]);
 
 function FxClick(val) {
   FxClickName.value = val;
-  if (FxClickName.value == '燃气') {
+  if (FxClickName.value == "燃气") {
     let obj = [
       {
-        name: '低风险  70%  1345.5',
+        name: "低风险  70%  1345.5",
         value: 1345.5,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险 20%  384.5',
+        name: "一般风险 20%  384.5",
         value: 384.5,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险 5%  91.11',
+        name: "较大风险 5%  91.11",
         value: 91.11,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险 5%  91',
+        name: "重大风险 5%  91",
         value: 91,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
 
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['燃气风险评估']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["燃气风险评估"]);
     // bus.emit("SiSeTuBol", true);
-    bus.emit('SetLayerShow', ['燃气视角']);
-  } else if (FxClickName.value == '排水') {
+    bus.emit("SetLayerShow", ["燃气视角"]);
+  } else if (FxClickName.value == "排水") {
     let obj = [
       {
-        name: '低风险  65%  76.7',
+        name: "低风险  65%  76.7",
         value: 76.7,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险 20%  23.6',
+        name: "一般风险 20%  23.6",
         value: 23.6,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险 10%  11.8',
+        name: "较大风险 10%  11.8",
         value: 11.8,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险 5%  5.9',
+        name: "重大风险 5%  5.9",
         value: 5.9,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
 
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['排水风险评估', '综合视角']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["排水风险评估", "综合视角"]);
     // bus.emit("SiSeTuBol", true);
-  } else if (FxClickName.value == '桥梁') {
+  } else if (FxClickName.value == "桥梁") {
     let obj = [
       {
-        name: '低风险  0%  0',
+        name: "低风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险  0%  0',
+        name: "一般风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险  0%  0',
+        name: "较大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险  0%  0',
+        name: "重大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
     let heatMapList = [
       { lonlat: [109.483918489923, 36.61249884561792], value: 2 },
       { lonlat: [109.49124949683474, 36.60775434074279], value: 2 },
@@ -389,54 +404,54 @@
     ];
     let heatMapJeojson = {};
     let heatMapFeatures = [];
-    heatMapList.forEach(element => {
+    heatMapList.forEach((element) => {
       let heatmap = turf.point(element.lonlat);
       heatmap.properties.value = element.value;
       gcoord.transform(heatmap, gcoord.BD09, gcoord.WGS84);
       heatMapFeatures.push(heatmap);
     });
     heatMapJeojson = turf.featureCollection(heatMapFeatures);
-    mapBoxVectorLayer.removeByIds(['heatMapLayer']);
-    mapBoxVectorLayer.addHeatMapLayer('heatMapLayer', heatMapJeojson, 'value');
-    heatMapJeojson.features.forEach(feature => {
+    mapBoxVectorLayer.removeByIds(["heatMapLayer"]);
+    mapBoxVectorLayer.addHeatMapLayer("heatMapLayer", heatMapJeojson, "value");
+    heatMapJeojson.features.forEach((feature) => {
       gcoord.transform(feature, gcoord.WGS84, gcoord.BD09);
     });
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['仿真地图', '桥梁视角']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["仿真地图", "桥梁视角"]);
   } else {
     let obj = [
       {
-        name: '低风险  0%  0',
+        name: "低风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险  0%  0',
+        name: "一般风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险  0%  0',
+        name: "较大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险  0%  0',
+        name: "重大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['仿真地图', '隧道视角']);
+    bus.emit("FxVisible", obj);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["仿真地图", "隧道视角"]);
   }
 }
 
@@ -455,10 +470,10 @@
   { immediate: true }
 );
 onMounted(() => {
-  bus.emit('FxVisible', obj.value);
+  bus.emit("FxVisible", obj.value);
 });
 onBeforeUnmount(() => {
-  mapBoxVectorLayer.removeByIds(['heatMapLayer']);
+  mapBoxVectorLayer.removeByIds(["heatMapLayer"]);
 });
 </script>
 
@@ -495,7 +510,11 @@
           height: 14px;
           width: 58%;
           margin-top: 8px;
-          background: linear-gradient(0deg, rgba(0, 43, 67, 0.8) 0%, rgba(0, 76, 118, 0.8) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(0, 43, 67, 0.8) 0%,
+            rgba(0, 76, 118, 0.8) 100%
+          );
           border-radius: 16px;
           // border: 1px solid #00B8F7;
           // background: yellow;
@@ -546,7 +565,7 @@
         .part {
           width: 130px;
           height: 160px;
-          background: url('@/assets/newImgs/iSpt.png') no-repeat;
+          background: url("@/assets/newImgs/iSpt.png") no-repeat;
           background-size: 100% 100%;
           .parttop {
             height: 160px;
@@ -614,7 +633,7 @@
   position: relative;
   width: 408px;
   height: 44px;
-  background: url('@/assets/newImgs/partBg.png') no-repeat;
+  background: url("@/assets/newImgs/partBg.png") no-repeat;
   background-size: 100% 100%;
   font-family: PangMenZhengDao;
   font-weight: 400;
@@ -634,7 +653,7 @@
       margin-left: 5px;
       width: 25px;
       height: 25px;
-      background: url('@/assets/newImgs/xtb_img.png') no-repeat;
+      background: url("@/assets/newImgs/xtb_img.png") no-repeat;
     }
     .text {
       font-family: Source Han Sans CN;
@@ -648,7 +667,11 @@
       //   rgba(0, 242, 255, 0.5) 0%,
       //   rgba(0, 242, 255, 0) 100%
       // );
-      background: linear-gradient(0deg, rgba(28, 138, 255, 0.5) 0%, rgba(28, 138, 255, 0) 100%);
+      background: linear-gradient(
+        0deg,
+        rgba(28, 138, 255, 0.5) 0%,
+        rgba(28, 138, 255, 0) 100%
+      );
       height: 10px;
       line-height: 0px;
       margin-top: 10px;
@@ -750,7 +773,7 @@
   height: 44px;
   line-height: 50px;
   width: 98%;
-  background: url('@/assets/newImgs/partBg.png') no-repeat;
+  background: url("@/assets/newImgs/partBg.png") no-repeat;
   background-size: 100% 100%;
   display: flex;
   align-items: center;
diff --git a/src/views/oneMap/SmartDrainage/PsRightBox.vue b/src/views/oneMap/SmartDrainage/PsRightBox.vue
index 322cead..bcb4123 100644
--- a/src/views/oneMap/SmartDrainage/PsRightBox.vue
+++ b/src/views/oneMap/SmartDrainage/PsRightBox.vue
@@ -521,7 +521,9 @@
   getWaterlogging();
 });
 
-onBeforeUnmount(() => {});
+onBeforeUnmount(() => {
+  bus.emit("clearAllLayer");
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/oneMap/components/FHPL.vue b/src/views/oneMap/components/FHPL.vue
index c13f893..8c32b49 100644
--- a/src/views/oneMap/components/FHPL.vue
+++ b/src/views/oneMap/components/FHPL.vue
@@ -64,9 +64,10 @@
 });
 function openUserDialog(params) {
   // isShowMonitorCalender.value = true;
+  bus.emit("clearAllLayer");
   isShowMonitorCalender.value = false;
   curType.value = true;
-  bus.$emit("changeShowPanel", false);
+  bus.emit("changeShowPanel", false);
 }
 // const change = (date) => {
 //   checkTime.value = date;

diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index e3eac7a..234bea5 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -253,7 +253,6 @@
       // });
       // 遍历模型中的所有网格
       gltf.scene.traverse((child) => {
-        console.log(child);
         if (child.name == "立方体1" || child.name == "立方体2") {
           // 修改或替换材质
           // child.material = new THREE.MeshBasicMaterial({ color: 0x545d0c}); // 将材质替换为红色基本材质
diff --git a/src/views/oneMap/OverallOverview/RightBox.vue b/src/views/oneMap/OverallOverview/RightBox.vue
index aa2ee6e..7764407 100644
--- a/src/views/oneMap/OverallOverview/RightBox.vue
+++ b/src/views/oneMap/OverallOverview/RightBox.vue
@@ -62,7 +62,14 @@
               {{ item.num }}
             </div>
 
-            <div style="font-family: Source Han Sans CN; font-weight: bold; font-size: 13px; color: #00b8f7">
+            <div
+              style="
+                font-family: Source Han Sans CN;
+                font-weight: bold;
+                font-size: 13px;
+                color: #00b8f7;
+              "
+            >
               {{ item.dw }}
             </div>
           </div>
@@ -127,7 +134,12 @@
                 <div
                   class="oflower"
                   :style="{
-                    color: item.gm == '较多' ? '#FF4D5DFF' : item.gm == '正常' ? '#2BE7ABFF' : '#F8E270FF',
+                    color:
+                      item.gm == '较多'
+                        ? '#FF4D5DFF'
+                        : item.gm == '正常'
+                        ? '#2BE7ABFF'
+                        : '#F8E270FF',
                   }"
                 >
                   {{ item.gm }}
@@ -139,49 +151,52 @@
       </div>
     </div>
     <div class="WarningEcharts">
-      <AssessmentjsEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentjsEcharts>
+      <AssessmentjsEcharts
+        :data="chartData2"
+        :refresh="chartData2.refresh"
+      ></AssessmentjsEcharts>
     </div>
   </div>
 </template>
 
 <script setup>
-import tslyqk_constituent_3d from '@/views/oneMap/Echarts/tslyqk_constituent_3d.vue'; //3d图例
-import AssessmentjsEcharts from '@/views/oneMap/Echarts/AssessmentjsEcharts.vue';
+import tslyqk_constituent_3d from "@/views/oneMap/Echarts/tslyqk_constituent_3d.vue"; //3d图例
+import AssessmentjsEcharts from "@/views/oneMap/Echarts/AssessmentjsEcharts.vue";
 
-import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from 'vue';
+import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from "vue";
 const AllData = reactive({});
-import yjsj from '@/assets/newImgs/yjsj.png'; //预警数据
-import czsj from '@/assets/newImgs/czsj.png'; //处置数据
-import czl from '@/assets/newImgs/czl.png'; //处置率
+import yjsj from "@/assets/newImgs/yjsj.png"; //预警数据
+import czsj from "@/assets/newImgs/czsj.png"; //处置数据
+import czl from "@/assets/newImgs/czl.png"; //处置率
 
-import ranqi_icon from '@/assets/newImgs/ranqi_icon.png'; //燃气
-import qiaoliang from '@/assets/newImgs/qiaoliang.png'; //桥梁
-import sd_icon from '@/assets/newImgs/sd_icon.png'; //隧道
-import ps_icon from '@/assets/newImgs/ps_icon.png'; //隧道
-import fxzb from '@/assets/newImgs/fxzb.png'; //风险占比
-import bus from '@/bus';
-import mapBoxVectorLayer from '@/utils/GISdocument/mapboxVectorLayer.js';
+import ranqi_icon from "@/assets/newImgs/ranqi_icon.png"; //燃气
+import qiaoliang from "@/assets/newImgs/qiaoliang.png"; //桥梁
+import sd_icon from "@/assets/newImgs/sd_icon.png"; //隧道
+import ps_icon from "@/assets/newImgs/ps_icon.png"; //隧道
+import fxzb from "@/assets/newImgs/fxzb.png"; //风险占比
+import bus from "@/bus";
+import mapBoxVectorLayer from "@/utils/GISdocument/mapboxVectorLayer.js";
 const yearList = ref([
-  { name: '月', value: 1 },
-  { name: '年', value: 2 },
+  { name: "月", value: 1 },
+  { name: "年", value: 2 },
 ]);
 const chartData2 = ref({
-  xAxis: ['12/1', '12/2', '12/3', '12/4', '12/5', '12/6'],
+  xAxis: ["12/1", "12/2", "12/3", "12/4", "12/5", "12/6"],
   refresh: 1,
 });
 const riskData = ref([
-  { name: '燃气', num: 4549.53, sl: 1922.11, Imgurl: ranqi_icon, dw: '公里' },
-  { name: '排水', num: 435.7, sl: 118, Imgurl: ps_icon, dw: '公里' },
-  { name: '桥梁', num: 84, sl: 0, Imgurl: qiaoliang, dw: '座' },
-  { name: '隧道', num: 1, sl: 0, Imgurl: sd_icon, dw: '座' },
+  { name: "燃气", num: 4979.88, sl: 149, Imgurl: ranqi_icon, dw: "公里" },
+  { name: "排水", num: 435.7, sl: 118, Imgurl: ps_icon, dw: "公里" },
+  { name: "桥梁", num: 84, sl: 0, Imgurl: qiaoliang, dw: "座" },
+  { name: "隧道", num: 1, sl: 0, Imgurl: sd_icon, dw: "座" },
 ]);
 const tableData = ref([
-  { name: '预警数量', num: '60', gm: '较多', Imgurl: yjsj },
-  { name: '处置数量', num: '60', gm: '正常', Imgurl: czsj },
-  { name: '处置率', num: '75%', gm: '未完成', Imgurl: czl },
+  { name: "预警数量", num: "60", gm: "较多", Imgurl: yjsj },
+  { name: "处置数量", num: "60", gm: "正常", Imgurl: czsj },
+  { name: "处置率", num: "75%", gm: "未完成", Imgurl: czl },
 ]);
 
-const activedname = ref('月');
+const activedname = ref("月");
 function yearclick(val) {
   activedname.value = val.name;
 }
@@ -195,145 +210,145 @@
 };
 
 // 风险评估点击事件
-const FxClickName = ref('燃气');
+const FxClickName = ref("燃气");
 const obj = ref([
   {
-    name: '低风险  70%  1345.5',
+    name: "低风险  70%  1345.5",
     value: 1345.5,
     itemStyle: {
-      color: '#2BE7ABFF',
+      color: "#2BE7ABFF",
     },
   },
   {
-    name: '一般风险 20%  384.5',
+    name: "一般风险 20%  384.5",
     value: 384.5,
     itemStyle: {
-      color: '#18A7F2FF',
+      color: "#18A7F2FF",
     },
   },
   {
-    name: '较大风险 5%  91.11',
+    name: "较大风险 5%  91.11",
     value: 91.11,
     itemStyle: {
-      color: '#F8E270FF',
+      color: "#F8E270FF",
     },
   },
   {
-    name: '重大风险 5%  91',
+    name: "重大风险 5%  91",
     value: 91,
     itemStyle: {
-      color: '#FF5D6CFF',
+      color: "#FF5D6CFF",
     },
   },
 ]);
 
 function FxClick(val) {
   FxClickName.value = val;
-  if (FxClickName.value == '燃气') {
+  if (FxClickName.value == "燃气") {
     let obj = [
       {
-        name: '低风险  70%  1345.5',
+        name: "低风险  70%  1345.5",
         value: 1345.5,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险 20%  384.5',
+        name: "一般风险 20%  384.5",
         value: 384.5,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险 5%  91.11',
+        name: "较大风险 5%  91.11",
         value: 91.11,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险 5%  91',
+        name: "重大风险 5%  91",
         value: 91,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
 
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['燃气风险评估']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["燃气风险评估"]);
     // bus.emit("SiSeTuBol", true);
-    bus.emit('SetLayerShow', ['燃气视角']);
-  } else if (FxClickName.value == '排水') {
+    bus.emit("SetLayerShow", ["燃气视角"]);
+  } else if (FxClickName.value == "排水") {
     let obj = [
       {
-        name: '低风险  65%  76.7',
+        name: "低风险  65%  76.7",
         value: 76.7,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险 20%  23.6',
+        name: "一般风险 20%  23.6",
         value: 23.6,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险 10%  11.8',
+        name: "较大风险 10%  11.8",
         value: 11.8,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险 5%  5.9',
+        name: "重大风险 5%  5.9",
         value: 5.9,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
 
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['排水风险评估', '综合视角']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["排水风险评估", "综合视角"]);
     // bus.emit("SiSeTuBol", true);
-  } else if (FxClickName.value == '桥梁') {
+  } else if (FxClickName.value == "桥梁") {
     let obj = [
       {
-        name: '低风险  0%  0',
+        name: "低风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险  0%  0',
+        name: "一般风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险  0%  0',
+        name: "较大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险  0%  0',
+        name: "重大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
     let heatMapList = [
       { lonlat: [109.483918489923, 36.61249884561792], value: 2 },
       { lonlat: [109.49124949683474, 36.60775434074279], value: 2 },
@@ -389,54 +404,54 @@
     ];
     let heatMapJeojson = {};
     let heatMapFeatures = [];
-    heatMapList.forEach(element => {
+    heatMapList.forEach((element) => {
       let heatmap = turf.point(element.lonlat);
       heatmap.properties.value = element.value;
       gcoord.transform(heatmap, gcoord.BD09, gcoord.WGS84);
       heatMapFeatures.push(heatmap);
     });
     heatMapJeojson = turf.featureCollection(heatMapFeatures);
-    mapBoxVectorLayer.removeByIds(['heatMapLayer']);
-    mapBoxVectorLayer.addHeatMapLayer('heatMapLayer', heatMapJeojson, 'value');
-    heatMapJeojson.features.forEach(feature => {
+    mapBoxVectorLayer.removeByIds(["heatMapLayer"]);
+    mapBoxVectorLayer.addHeatMapLayer("heatMapLayer", heatMapJeojson, "value");
+    heatMapJeojson.features.forEach((feature) => {
       gcoord.transform(feature, gcoord.WGS84, gcoord.BD09);
     });
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['仿真地图', '桥梁视角']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["仿真地图", "桥梁视角"]);
   } else {
     let obj = [
       {
-        name: '低风险  0%  0',
+        name: "低风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险  0%  0',
+        name: "一般风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险  0%  0',
+        name: "较大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险  0%  0',
+        name: "重大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['仿真地图', '隧道视角']);
+    bus.emit("FxVisible", obj);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["仿真地图", "隧道视角"]);
   }
 }
 
@@ -455,10 +470,10 @@
   { immediate: true }
 );
 onMounted(() => {
-  bus.emit('FxVisible', obj.value);
+  bus.emit("FxVisible", obj.value);
 });
 onBeforeUnmount(() => {
-  mapBoxVectorLayer.removeByIds(['heatMapLayer']);
+  mapBoxVectorLayer.removeByIds(["heatMapLayer"]);
 });
 </script>
 
@@ -495,7 +510,11 @@
           height: 14px;
           width: 58%;
           margin-top: 8px;
-          background: linear-gradient(0deg, rgba(0, 43, 67, 0.8) 0%, rgba(0, 76, 118, 0.8) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(0, 43, 67, 0.8) 0%,
+            rgba(0, 76, 118, 0.8) 100%
+          );
           border-radius: 16px;
           // border: 1px solid #00B8F7;
           // background: yellow;
@@ -546,7 +565,7 @@
         .part {
           width: 130px;
           height: 160px;
-          background: url('@/assets/newImgs/iSpt.png') no-repeat;
+          background: url("@/assets/newImgs/iSpt.png") no-repeat;
           background-size: 100% 100%;
           .parttop {
             height: 160px;
@@ -614,7 +633,7 @@
   position: relative;
   width: 408px;
   height: 44px;
-  background: url('@/assets/newImgs/partBg.png') no-repeat;
+  background: url("@/assets/newImgs/partBg.png") no-repeat;
   background-size: 100% 100%;
   font-family: PangMenZhengDao;
   font-weight: 400;
@@ -634,7 +653,7 @@
       margin-left: 5px;
       width: 25px;
       height: 25px;
-      background: url('@/assets/newImgs/xtb_img.png') no-repeat;
+      background: url("@/assets/newImgs/xtb_img.png") no-repeat;
     }
     .text {
       font-family: Source Han Sans CN;
@@ -648,7 +667,11 @@
       //   rgba(0, 242, 255, 0.5) 0%,
       //   rgba(0, 242, 255, 0) 100%
       // );
-      background: linear-gradient(0deg, rgba(28, 138, 255, 0.5) 0%, rgba(28, 138, 255, 0) 100%);
+      background: linear-gradient(
+        0deg,
+        rgba(28, 138, 255, 0.5) 0%,
+        rgba(28, 138, 255, 0) 100%
+      );
       height: 10px;
       line-height: 0px;
       margin-top: 10px;
@@ -750,7 +773,7 @@
   height: 44px;
   line-height: 50px;
   width: 98%;
-  background: url('@/assets/newImgs/partBg.png') no-repeat;
+  background: url("@/assets/newImgs/partBg.png") no-repeat;
   background-size: 100% 100%;
   display: flex;
   align-items: center;
diff --git a/src/views/oneMap/SmartDrainage/PsRightBox.vue b/src/views/oneMap/SmartDrainage/PsRightBox.vue
index 322cead..bcb4123 100644
--- a/src/views/oneMap/SmartDrainage/PsRightBox.vue
+++ b/src/views/oneMap/SmartDrainage/PsRightBox.vue
@@ -521,7 +521,9 @@
   getWaterlogging();
 });
 
-onBeforeUnmount(() => {});
+onBeforeUnmount(() => {
+  bus.emit("clearAllLayer");
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/oneMap/components/FHPL.vue b/src/views/oneMap/components/FHPL.vue
index c13f893..8c32b49 100644
--- a/src/views/oneMap/components/FHPL.vue
+++ b/src/views/oneMap/components/FHPL.vue
@@ -64,9 +64,10 @@
 });
 function openUserDialog(params) {
   // isShowMonitorCalender.value = true;
+  bus.emit("clearAllLayer");
   isShowMonitorCalender.value = false;
   curType.value = true;
-  bus.$emit("changeShowPanel", false);
+  bus.emit("changeShowPanel", false);
 }
 // const change = (date) => {
 //   checkTime.value = date;
diff --git a/src/views/oneMap/components/FXHG.vue b/src/views/oneMap/components/FXHG.vue
index cebdee2..d82bb02 100644
--- a/src/views/oneMap/components/FXHG.vue
+++ b/src/views/oneMap/components/FXHG.vue
@@ -89,7 +89,7 @@
 
   let initePSTimer = setInterval(() => {
     if (!newfiberMapbox) return;
-    bus.emit("SetLayerShow", ["白色地图"]);
+    // bus.emit("SetLayerShow", ["白色地图"]);
     bus.emit("setLayerVisible", { layername: "pipeline_info_flow_ys", isCheck: true });
     //bus.emit('setLayerVisible', { layername: 'wsLine1', isCheck: true });
     clearInterval(initePSTimer);

diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index e3eac7a..234bea5 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -253,7 +253,6 @@
       // });
       // 遍历模型中的所有网格
       gltf.scene.traverse((child) => {
-        console.log(child);
         if (child.name == "立方体1" || child.name == "立方体2") {
           // 修改或替换材质
           // child.material = new THREE.MeshBasicMaterial({ color: 0x545d0c}); // 将材质替换为红色基本材质
diff --git a/src/views/oneMap/OverallOverview/RightBox.vue b/src/views/oneMap/OverallOverview/RightBox.vue
index aa2ee6e..7764407 100644
--- a/src/views/oneMap/OverallOverview/RightBox.vue
+++ b/src/views/oneMap/OverallOverview/RightBox.vue
@@ -62,7 +62,14 @@
               {{ item.num }}
             </div>
 
-            <div style="font-family: Source Han Sans CN; font-weight: bold; font-size: 13px; color: #00b8f7">
+            <div
+              style="
+                font-family: Source Han Sans CN;
+                font-weight: bold;
+                font-size: 13px;
+                color: #00b8f7;
+              "
+            >
               {{ item.dw }}
             </div>
           </div>
@@ -127,7 +134,12 @@
                 <div
                   class="oflower"
                   :style="{
-                    color: item.gm == '较多' ? '#FF4D5DFF' : item.gm == '正常' ? '#2BE7ABFF' : '#F8E270FF',
+                    color:
+                      item.gm == '较多'
+                        ? '#FF4D5DFF'
+                        : item.gm == '正常'
+                        ? '#2BE7ABFF'
+                        : '#F8E270FF',
                   }"
                 >
                   {{ item.gm }}
@@ -139,49 +151,52 @@
       </div>
     </div>
     <div class="WarningEcharts">
-      <AssessmentjsEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentjsEcharts>
+      <AssessmentjsEcharts
+        :data="chartData2"
+        :refresh="chartData2.refresh"
+      ></AssessmentjsEcharts>
     </div>
   </div>
 </template>
 
 <script setup>
-import tslyqk_constituent_3d from '@/views/oneMap/Echarts/tslyqk_constituent_3d.vue'; //3d图例
-import AssessmentjsEcharts from '@/views/oneMap/Echarts/AssessmentjsEcharts.vue';
+import tslyqk_constituent_3d from "@/views/oneMap/Echarts/tslyqk_constituent_3d.vue"; //3d图例
+import AssessmentjsEcharts from "@/views/oneMap/Echarts/AssessmentjsEcharts.vue";
 
-import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from 'vue';
+import { ref, reactive, toRefs, onMounted, onBeforeUnmount } from "vue";
 const AllData = reactive({});
-import yjsj from '@/assets/newImgs/yjsj.png'; //预警数据
-import czsj from '@/assets/newImgs/czsj.png'; //处置数据
-import czl from '@/assets/newImgs/czl.png'; //处置率
+import yjsj from "@/assets/newImgs/yjsj.png"; //预警数据
+import czsj from "@/assets/newImgs/czsj.png"; //处置数据
+import czl from "@/assets/newImgs/czl.png"; //处置率
 
-import ranqi_icon from '@/assets/newImgs/ranqi_icon.png'; //燃气
-import qiaoliang from '@/assets/newImgs/qiaoliang.png'; //桥梁
-import sd_icon from '@/assets/newImgs/sd_icon.png'; //隧道
-import ps_icon from '@/assets/newImgs/ps_icon.png'; //隧道
-import fxzb from '@/assets/newImgs/fxzb.png'; //风险占比
-import bus from '@/bus';
-import mapBoxVectorLayer from '@/utils/GISdocument/mapboxVectorLayer.js';
+import ranqi_icon from "@/assets/newImgs/ranqi_icon.png"; //燃气
+import qiaoliang from "@/assets/newImgs/qiaoliang.png"; //桥梁
+import sd_icon from "@/assets/newImgs/sd_icon.png"; //隧道
+import ps_icon from "@/assets/newImgs/ps_icon.png"; //隧道
+import fxzb from "@/assets/newImgs/fxzb.png"; //风险占比
+import bus from "@/bus";
+import mapBoxVectorLayer from "@/utils/GISdocument/mapboxVectorLayer.js";
 const yearList = ref([
-  { name: '月', value: 1 },
-  { name: '年', value: 2 },
+  { name: "月", value: 1 },
+  { name: "年", value: 2 },
 ]);
 const chartData2 = ref({
-  xAxis: ['12/1', '12/2', '12/3', '12/4', '12/5', '12/6'],
+  xAxis: ["12/1", "12/2", "12/3", "12/4", "12/5", "12/6"],
   refresh: 1,
 });
 const riskData = ref([
-  { name: '燃气', num: 4549.53, sl: 1922.11, Imgurl: ranqi_icon, dw: '公里' },
-  { name: '排水', num: 435.7, sl: 118, Imgurl: ps_icon, dw: '公里' },
-  { name: '桥梁', num: 84, sl: 0, Imgurl: qiaoliang, dw: '座' },
-  { name: '隧道', num: 1, sl: 0, Imgurl: sd_icon, dw: '座' },
+  { name: "燃气", num: 4979.88, sl: 149, Imgurl: ranqi_icon, dw: "公里" },
+  { name: "排水", num: 435.7, sl: 118, Imgurl: ps_icon, dw: "公里" },
+  { name: "桥梁", num: 84, sl: 0, Imgurl: qiaoliang, dw: "座" },
+  { name: "隧道", num: 1, sl: 0, Imgurl: sd_icon, dw: "座" },
 ]);
 const tableData = ref([
-  { name: '预警数量', num: '60', gm: '较多', Imgurl: yjsj },
-  { name: '处置数量', num: '60', gm: '正常', Imgurl: czsj },
-  { name: '处置率', num: '75%', gm: '未完成', Imgurl: czl },
+  { name: "预警数量", num: "60", gm: "较多", Imgurl: yjsj },
+  { name: "处置数量", num: "60", gm: "正常", Imgurl: czsj },
+  { name: "处置率", num: "75%", gm: "未完成", Imgurl: czl },
 ]);
 
-const activedname = ref('月');
+const activedname = ref("月");
 function yearclick(val) {
   activedname.value = val.name;
 }
@@ -195,145 +210,145 @@
 };
 
 // 风险评估点击事件
-const FxClickName = ref('燃气');
+const FxClickName = ref("燃气");
 const obj = ref([
   {
-    name: '低风险  70%  1345.5',
+    name: "低风险  70%  1345.5",
     value: 1345.5,
     itemStyle: {
-      color: '#2BE7ABFF',
+      color: "#2BE7ABFF",
     },
   },
   {
-    name: '一般风险 20%  384.5',
+    name: "一般风险 20%  384.5",
     value: 384.5,
     itemStyle: {
-      color: '#18A7F2FF',
+      color: "#18A7F2FF",
     },
   },
   {
-    name: '较大风险 5%  91.11',
+    name: "较大风险 5%  91.11",
     value: 91.11,
     itemStyle: {
-      color: '#F8E270FF',
+      color: "#F8E270FF",
     },
   },
   {
-    name: '重大风险 5%  91',
+    name: "重大风险 5%  91",
     value: 91,
     itemStyle: {
-      color: '#FF5D6CFF',
+      color: "#FF5D6CFF",
     },
   },
 ]);
 
 function FxClick(val) {
   FxClickName.value = val;
-  if (FxClickName.value == '燃气') {
+  if (FxClickName.value == "燃气") {
     let obj = [
       {
-        name: '低风险  70%  1345.5',
+        name: "低风险  70%  1345.5",
         value: 1345.5,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险 20%  384.5',
+        name: "一般风险 20%  384.5",
         value: 384.5,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险 5%  91.11',
+        name: "较大风险 5%  91.11",
         value: 91.11,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险 5%  91',
+        name: "重大风险 5%  91",
         value: 91,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
 
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['燃气风险评估']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["燃气风险评估"]);
     // bus.emit("SiSeTuBol", true);
-    bus.emit('SetLayerShow', ['燃气视角']);
-  } else if (FxClickName.value == '排水') {
+    bus.emit("SetLayerShow", ["燃气视角"]);
+  } else if (FxClickName.value == "排水") {
     let obj = [
       {
-        name: '低风险  65%  76.7',
+        name: "低风险  65%  76.7",
         value: 76.7,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险 20%  23.6',
+        name: "一般风险 20%  23.6",
         value: 23.6,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险 10%  11.8',
+        name: "较大风险 10%  11.8",
         value: 11.8,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险 5%  5.9',
+        name: "重大风险 5%  5.9",
         value: 5.9,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
 
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['排水风险评估', '综合视角']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["排水风险评估", "综合视角"]);
     // bus.emit("SiSeTuBol", true);
-  } else if (FxClickName.value == '桥梁') {
+  } else if (FxClickName.value == "桥梁") {
     let obj = [
       {
-        name: '低风险  0%  0',
+        name: "低风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险  0%  0',
+        name: "一般风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险  0%  0',
+        name: "较大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险  0%  0',
+        name: "重大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
+    bus.emit("FxVisible", obj);
     let heatMapList = [
       { lonlat: [109.483918489923, 36.61249884561792], value: 2 },
       { lonlat: [109.49124949683474, 36.60775434074279], value: 2 },
@@ -389,54 +404,54 @@
     ];
     let heatMapJeojson = {};
     let heatMapFeatures = [];
-    heatMapList.forEach(element => {
+    heatMapList.forEach((element) => {
       let heatmap = turf.point(element.lonlat);
       heatmap.properties.value = element.value;
       gcoord.transform(heatmap, gcoord.BD09, gcoord.WGS84);
       heatMapFeatures.push(heatmap);
     });
     heatMapJeojson = turf.featureCollection(heatMapFeatures);
-    mapBoxVectorLayer.removeByIds(['heatMapLayer']);
-    mapBoxVectorLayer.addHeatMapLayer('heatMapLayer', heatMapJeojson, 'value');
-    heatMapJeojson.features.forEach(feature => {
+    mapBoxVectorLayer.removeByIds(["heatMapLayer"]);
+    mapBoxVectorLayer.addHeatMapLayer("heatMapLayer", heatMapJeojson, "value");
+    heatMapJeojson.features.forEach((feature) => {
       gcoord.transform(feature, gcoord.WGS84, gcoord.BD09);
     });
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['仿真地图', '桥梁视角']);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["仿真地图", "桥梁视角"]);
   } else {
     let obj = [
       {
-        name: '低风险  0%  0',
+        name: "低风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#2BE7ABFF',
+          color: "#2BE7ABFF",
         },
       },
       {
-        name: '一般风险  0%  0',
+        name: "一般风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#18A7F2FF',
+          color: "#18A7F2FF",
         },
       },
       {
-        name: '较大风险  0%  0',
+        name: "较大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#F8E270FF',
+          color: "#F8E270FF",
         },
       },
       {
-        name: '重大风险  0%  0',
+        name: "重大风险  0%  0",
         value: 0,
         itemStyle: {
-          color: '#FF5D6CFF',
+          color: "#FF5D6CFF",
         },
       },
     ];
-    bus.emit('FxVisible', obj);
-    bus.emit('clearAllLayer');
-    bus.emit('SetLayerShow', ['仿真地图', '隧道视角']);
+    bus.emit("FxVisible", obj);
+    bus.emit("clearAllLayer");
+    bus.emit("SetLayerShow", ["仿真地图", "隧道视角"]);
   }
 }
 
@@ -455,10 +470,10 @@
   { immediate: true }
 );
 onMounted(() => {
-  bus.emit('FxVisible', obj.value);
+  bus.emit("FxVisible", obj.value);
 });
 onBeforeUnmount(() => {
-  mapBoxVectorLayer.removeByIds(['heatMapLayer']);
+  mapBoxVectorLayer.removeByIds(["heatMapLayer"]);
 });
 </script>
 
@@ -495,7 +510,11 @@
           height: 14px;
           width: 58%;
           margin-top: 8px;
-          background: linear-gradient(0deg, rgba(0, 43, 67, 0.8) 0%, rgba(0, 76, 118, 0.8) 100%);
+          background: linear-gradient(
+            0deg,
+            rgba(0, 43, 67, 0.8) 0%,
+            rgba(0, 76, 118, 0.8) 100%
+          );
           border-radius: 16px;
           // border: 1px solid #00B8F7;
           // background: yellow;
@@ -546,7 +565,7 @@
         .part {
           width: 130px;
           height: 160px;
-          background: url('@/assets/newImgs/iSpt.png') no-repeat;
+          background: url("@/assets/newImgs/iSpt.png") no-repeat;
           background-size: 100% 100%;
           .parttop {
             height: 160px;
@@ -614,7 +633,7 @@
   position: relative;
   width: 408px;
   height: 44px;
-  background: url('@/assets/newImgs/partBg.png') no-repeat;
+  background: url("@/assets/newImgs/partBg.png") no-repeat;
   background-size: 100% 100%;
   font-family: PangMenZhengDao;
   font-weight: 400;
@@ -634,7 +653,7 @@
       margin-left: 5px;
       width: 25px;
       height: 25px;
-      background: url('@/assets/newImgs/xtb_img.png') no-repeat;
+      background: url("@/assets/newImgs/xtb_img.png") no-repeat;
     }
     .text {
       font-family: Source Han Sans CN;
@@ -648,7 +667,11 @@
       //   rgba(0, 242, 255, 0.5) 0%,
       //   rgba(0, 242, 255, 0) 100%
       // );
-      background: linear-gradient(0deg, rgba(28, 138, 255, 0.5) 0%, rgba(28, 138, 255, 0) 100%);
+      background: linear-gradient(
+        0deg,
+        rgba(28, 138, 255, 0.5) 0%,
+        rgba(28, 138, 255, 0) 100%
+      );
       height: 10px;
       line-height: 0px;
       margin-top: 10px;
@@ -750,7 +773,7 @@
   height: 44px;
   line-height: 50px;
   width: 98%;
-  background: url('@/assets/newImgs/partBg.png') no-repeat;
+  background: url("@/assets/newImgs/partBg.png") no-repeat;
   background-size: 100% 100%;
   display: flex;
   align-items: center;
diff --git a/src/views/oneMap/SmartDrainage/PsRightBox.vue b/src/views/oneMap/SmartDrainage/PsRightBox.vue
index 322cead..bcb4123 100644
--- a/src/views/oneMap/SmartDrainage/PsRightBox.vue
+++ b/src/views/oneMap/SmartDrainage/PsRightBox.vue
@@ -521,7 +521,9 @@
   getWaterlogging();
 });
 
-onBeforeUnmount(() => {});
+onBeforeUnmount(() => {
+  bus.emit("clearAllLayer");
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/oneMap/components/FHPL.vue b/src/views/oneMap/components/FHPL.vue
index c13f893..8c32b49 100644
--- a/src/views/oneMap/components/FHPL.vue
+++ b/src/views/oneMap/components/FHPL.vue
@@ -64,9 +64,10 @@
 });
 function openUserDialog(params) {
   // isShowMonitorCalender.value = true;
+  bus.emit("clearAllLayer");
   isShowMonitorCalender.value = false;
   curType.value = true;
-  bus.$emit("changeShowPanel", false);
+  bus.emit("changeShowPanel", false);
 }
 // const change = (date) => {
 //   checkTime.value = date;
diff --git a/src/views/oneMap/components/FXHG.vue b/src/views/oneMap/components/FXHG.vue
index cebdee2..d82bb02 100644
--- a/src/views/oneMap/components/FXHG.vue
+++ b/src/views/oneMap/components/FXHG.vue
@@ -89,7 +89,7 @@
 
   let initePSTimer = setInterval(() => {
     if (!newfiberMapbox) return;
-    bus.emit("SetLayerShow", ["白色地图"]);
+    // bus.emit("SetLayerShow", ["白色地图"]);
     bus.emit("setLayerVisible", { layername: "pipeline_info_flow_ys", isCheck: true });
     //bus.emit('setLayerVisible', { layername: 'wsLine1', isCheck: true });
     clearInterval(initePSTimer);
diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue
index 3697f49..7252623 100644
--- a/src/views/oneMap/components/ZHRQ.vue
+++ b/src/views/oneMap/components/ZHRQ.vue
@@ -10,12 +10,12 @@
             <div class="TJList TJList_RQ" @click="TuChengClick(0)">
               <img class="TJListImg" src="@/assets/images/Sponge_screen/RQ/RQ_RQ.png" alt="" />
               <span class="TJListName">燃气管道</span>
-              <span class="TJListValue">4549km</span>
+              <span class="TJListValue">4979km</span>
             </div>
             <div class="TJList TJList_GZ">
               <img class="TJListImg" src="@/assets/images/Sponge_screen/RQ/RQ_GZ.png" alt="" />
               <span class="TJListName">需改造</span>
-              <span class="TJListValue">1922km</span>
+              <span class="TJListValue">149km</span>
             </div>
           </div>
           <div class="RQ_EchartsBox" id="Echarts2Box"></div>