diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/assets/images/donghu/bottombg.png b/src/assets/images/donghu/bottombg.png
new file mode 100644
index 0000000..5fabfc1
--- /dev/null
+++ b/src/assets/images/donghu/bottombg.png
Binary files differ

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/assets/images/donghu/bottombg.png b/src/assets/images/donghu/bottombg.png
new file mode 100644
index 0000000..5fabfc1
--- /dev/null
+++ b/src/assets/images/donghu/bottombg.png
Binary files differ
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index bd3bb73..4b2f79a 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -22,7 +22,7 @@
     .eachClick {
       // width: 64px;
       height: 26px;
-      background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
+      background: linear-gradient(0deg, rgba(0, 98, 183, 0.8) 0%, rgba(0, 98, 183, 0.1) 100%);
       margin-left: 10px;
       padding: 0 12px;
 
@@ -69,9 +69,10 @@
   left: 50%;
   transform: translateX(-50%);
   bottom: 20px;
-  background: linear-gradient(90deg, rgba(11, 18, 28, 0.4) 0%, rgba(48, 58, 69, 0.3) 4100%);
+  background: url('@/assets/images/donghu/bottombg.png') no-repeat;
   background-size: 100% 100%;
   z-index: 10;
+  padding-top: 10px;
 }
 
 .pbottom {

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/assets/images/donghu/bottombg.png b/src/assets/images/donghu/bottombg.png
new file mode 100644
index 0000000..5fabfc1
--- /dev/null
+++ b/src/assets/images/donghu/bottombg.png
Binary files differ
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index bd3bb73..4b2f79a 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -22,7 +22,7 @@
     .eachClick {
       // width: 64px;
       height: 26px;
-      background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
+      background: linear-gradient(0deg, rgba(0, 98, 183, 0.8) 0%, rgba(0, 98, 183, 0.1) 100%);
       margin-left: 10px;
       padding: 0 12px;
 
@@ -69,9 +69,10 @@
   left: 50%;
   transform: translateX(-50%);
   bottom: 20px;
-  background: linear-gradient(90deg, rgba(11, 18, 28, 0.4) 0%, rgba(48, 58, 69, 0.3) 4100%);
+  background: url('@/assets/images/donghu/bottombg.png') no-repeat;
   background-size: 100% 100%;
   z-index: 10;
+  padding-top: 10px;
 }
 
 .pbottom {
diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue
index def8832..f2d1eda 100644
--- a/src/views/RongyunCommunication/ModalContact/index.vue
+++ b/src/views/RongyunCommunication/ModalContact/index.vue
@@ -4,7 +4,11 @@
     v-model="props.dialogShow"
     title="融云通讯录"
     :close-on-click-modal="false"
+    modal-class="pmpSitNewDialog"
     class="contactBoxRY"
+    append-to-body
+    width="1000px"
+    z-index="9999"
     center
     :before-close="closeDalog"
   >

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/assets/images/donghu/bottombg.png b/src/assets/images/donghu/bottombg.png
new file mode 100644
index 0000000..5fabfc1
--- /dev/null
+++ b/src/assets/images/donghu/bottombg.png
Binary files differ
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index bd3bb73..4b2f79a 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -22,7 +22,7 @@
     .eachClick {
       // width: 64px;
       height: 26px;
-      background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
+      background: linear-gradient(0deg, rgba(0, 98, 183, 0.8) 0%, rgba(0, 98, 183, 0.1) 100%);
       margin-left: 10px;
       padding: 0 12px;
 
@@ -69,9 +69,10 @@
   left: 50%;
   transform: translateX(-50%);
   bottom: 20px;
-  background: linear-gradient(90deg, rgba(11, 18, 28, 0.4) 0%, rgba(48, 58, 69, 0.3) 4100%);
+  background: url('@/assets/images/donghu/bottombg.png') no-repeat;
   background-size: 100% 100%;
   z-index: 10;
+  padding-top: 10px;
 }
 
 .pbottom {
diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue
index def8832..f2d1eda 100644
--- a/src/views/RongyunCommunication/ModalContact/index.vue
+++ b/src/views/RongyunCommunication/ModalContact/index.vue
@@ -4,7 +4,11 @@
     v-model="props.dialogShow"
     title="融云通讯录"
     :close-on-click-modal="false"
+    modal-class="pmpSitNewDialog"
     class="contactBoxRY"
+    append-to-body
+    width="1000px"
+    z-index="9999"
     center
     :before-close="closeDalog"
   >
diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue
index b2b4b17..af92ff6 100644
--- a/src/views/RongyunCommunication/ModelRongYun/index.vue
+++ b/src/views/RongyunCommunication/ModelRongYun/index.vue
@@ -3,7 +3,14 @@
     <!-- 视频弹窗 -->
     <ModalContact :dialogShow="allData.dialogVisible" @dialogHide="dialogHide"></ModalContact>
     <!-- 融云 -->
-    <el-dialog :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" :show-close="false">
+    <el-dialog
+      :close-on-click-modal="false"
+      v-model="RYShow"
+      class="RongYunWindowShow"
+      :show-close="false"
+      append-to-body
+      modal-class="pmpSitNewDialog"
+    >
       <div class="RYdia" v-if="RYShow">
         <div class="topBox">
           <div class="boxName">
@@ -129,6 +136,10 @@
 <style lang="scss" scoped>
 .ModelRongYun {
   line-height: 22px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+
   #TitleDiv {
     width: 100%;
     height: 76px;

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/assets/images/donghu/bottombg.png b/src/assets/images/donghu/bottombg.png
new file mode 100644
index 0000000..5fabfc1
--- /dev/null
+++ b/src/assets/images/donghu/bottombg.png
Binary files differ
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index bd3bb73..4b2f79a 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -22,7 +22,7 @@
     .eachClick {
       // width: 64px;
       height: 26px;
-      background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
+      background: linear-gradient(0deg, rgba(0, 98, 183, 0.8) 0%, rgba(0, 98, 183, 0.1) 100%);
       margin-left: 10px;
       padding: 0 12px;
 
@@ -69,9 +69,10 @@
   left: 50%;
   transform: translateX(-50%);
   bottom: 20px;
-  background: linear-gradient(90deg, rgba(11, 18, 28, 0.4) 0%, rgba(48, 58, 69, 0.3) 4100%);
+  background: url('@/assets/images/donghu/bottombg.png') no-repeat;
   background-size: 100% 100%;
   z-index: 10;
+  padding-top: 10px;
 }
 
 .pbottom {
diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue
index def8832..f2d1eda 100644
--- a/src/views/RongyunCommunication/ModalContact/index.vue
+++ b/src/views/RongyunCommunication/ModalContact/index.vue
@@ -4,7 +4,11 @@
     v-model="props.dialogShow"
     title="融云通讯录"
     :close-on-click-modal="false"
+    modal-class="pmpSitNewDialog"
     class="contactBoxRY"
+    append-to-body
+    width="1000px"
+    z-index="9999"
     center
     :before-close="closeDalog"
   >
diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue
index b2b4b17..af92ff6 100644
--- a/src/views/RongyunCommunication/ModelRongYun/index.vue
+++ b/src/views/RongyunCommunication/ModelRongYun/index.vue
@@ -3,7 +3,14 @@
     <!-- 视频弹窗 -->
     <ModalContact :dialogShow="allData.dialogVisible" @dialogHide="dialogHide"></ModalContact>
     <!-- 融云 -->
-    <el-dialog :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" :show-close="false">
+    <el-dialog
+      :close-on-click-modal="false"
+      v-model="RYShow"
+      class="RongYunWindowShow"
+      :show-close="false"
+      append-to-body
+      modal-class="pmpSitNewDialog"
+    >
       <div class="RYdia" v-if="RYShow">
         <div class="topBox">
           <div class="boxName">
@@ -129,6 +136,10 @@
 <style lang="scss" scoped>
 .ModelRongYun {
   line-height: 22px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+
   #TitleDiv {
     width: 100%;
     height: 76px;
diff --git a/src/views/RongyunCommunication/RongYunBox/index.vue b/src/views/RongyunCommunication/RongYunBox/index.vue
index 62deb05..706cb8d 100644
--- a/src/views/RongyunCommunication/RongYunBox/index.vue
+++ b/src/views/RongyunCommunication/RongYunBox/index.vue
@@ -101,8 +101,7 @@
   answer,
   hangUp,
 } from '@/views/RongyunCommunication/rongyunjs/rongyunApi.js';
-// import { listDept } from '@/api/system/dept.js';
-import { findCurrentTreeObj } from '@/utils/util';
+import { findCurrentTreeObj } from '@/utils/ruoyi';
 
 const appStore = useUserStore();
 const useRongyunStore = rongyunStore();

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/assets/images/donghu/bottombg.png b/src/assets/images/donghu/bottombg.png
new file mode 100644
index 0000000..5fabfc1
--- /dev/null
+++ b/src/assets/images/donghu/bottombg.png
Binary files differ
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index bd3bb73..4b2f79a 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -22,7 +22,7 @@
     .eachClick {
       // width: 64px;
       height: 26px;
-      background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
+      background: linear-gradient(0deg, rgba(0, 98, 183, 0.8) 0%, rgba(0, 98, 183, 0.1) 100%);
       margin-left: 10px;
       padding: 0 12px;
 
@@ -69,9 +69,10 @@
   left: 50%;
   transform: translateX(-50%);
   bottom: 20px;
-  background: linear-gradient(90deg, rgba(11, 18, 28, 0.4) 0%, rgba(48, 58, 69, 0.3) 4100%);
+  background: url('@/assets/images/donghu/bottombg.png') no-repeat;
   background-size: 100% 100%;
   z-index: 10;
+  padding-top: 10px;
 }
 
 .pbottom {
diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue
index def8832..f2d1eda 100644
--- a/src/views/RongyunCommunication/ModalContact/index.vue
+++ b/src/views/RongyunCommunication/ModalContact/index.vue
@@ -4,7 +4,11 @@
     v-model="props.dialogShow"
     title="融云通讯录"
     :close-on-click-modal="false"
+    modal-class="pmpSitNewDialog"
     class="contactBoxRY"
+    append-to-body
+    width="1000px"
+    z-index="9999"
     center
     :before-close="closeDalog"
   >
diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue
index b2b4b17..af92ff6 100644
--- a/src/views/RongyunCommunication/ModelRongYun/index.vue
+++ b/src/views/RongyunCommunication/ModelRongYun/index.vue
@@ -3,7 +3,14 @@
     <!-- 视频弹窗 -->
     <ModalContact :dialogShow="allData.dialogVisible" @dialogHide="dialogHide"></ModalContact>
     <!-- 融云 -->
-    <el-dialog :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" :show-close="false">
+    <el-dialog
+      :close-on-click-modal="false"
+      v-model="RYShow"
+      class="RongYunWindowShow"
+      :show-close="false"
+      append-to-body
+      modal-class="pmpSitNewDialog"
+    >
       <div class="RYdia" v-if="RYShow">
         <div class="topBox">
           <div class="boxName">
@@ -129,6 +136,10 @@
 <style lang="scss" scoped>
 .ModelRongYun {
   line-height: 22px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+
   #TitleDiv {
     width: 100%;
     height: 76px;
diff --git a/src/views/RongyunCommunication/RongYunBox/index.vue b/src/views/RongyunCommunication/RongYunBox/index.vue
index 62deb05..706cb8d 100644
--- a/src/views/RongyunCommunication/RongYunBox/index.vue
+++ b/src/views/RongyunCommunication/RongYunBox/index.vue
@@ -101,8 +101,7 @@
   answer,
   hangUp,
 } from '@/views/RongyunCommunication/rongyunjs/rongyunApi.js';
-// import { listDept } from '@/api/system/dept.js';
-import { findCurrentTreeObj } from '@/utils/util';
+import { findCurrentTreeObj } from '@/utils/ruoyi';
 
 const appStore = useUserStore();
 const useRongyunStore = rongyunStore();
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 6418e50..693890a 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -126,48 +126,59 @@
   const openLayer = _.difference(newVal, oldVal);
   const closeLayer = _.difference(oldVal, newVal);
 
-  function changeyangshi() {
-    const targetElements = document.querySelectorAll('.target-class');
-    targetElements.forEach(target => {
-      const parent = target.parentElement; // 获取父级元素
-      console.log('parent', parent);
-      if (parent) {
-        parent.classList.add('mycustomclass');
-        // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
-        // 你可以在这里设置父级元素的其他样式
-      }
-    });
-  }
-
-  onMounted(() => {
-    nextTick(() => {
-      changeyangshi();
-    });
-    bus.on('YQ_head', val => {
-      if (val == false) {
-        Show.value = false;
-      } else {
-        Show.value = true;
-      }
-    });
-  });
-
-  onBeforeUnmount(() => {
-    bus.off('YQ_head');
-  });
   openLayer.length &&
     openLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? false : true }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? false : true,
+        })
+      );
   closeLayer.length &&
     closeLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? true : false }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? true : false,
+        })
+      );
   newfiberMap.map.triggerRepaint();
 }
 
+function changeyangshi() {
+  const targetElements = document.querySelectorAll('.target-class');
+  targetElements.forEach(target => {
+    const parent = target.parentElement; // 获取父级元素
+    console.log('parent', parent);
+    if (parent) {
+      parent.classList.add('mycustomclass');
+      // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
+      // 你可以在这里设置父级元素的其他样式
+    }
+  });
+}
+
+onMounted(() => {
+  nextTick(() => {
+    changeyangshi();
+  });
+  bus.on('YQ_head', val => {
+    if (val == false) {
+      Show.value = false;
+    } else {
+      Show.value = true;
+    }
+  });
+});
+
+onBeforeUnmount(() => {
+  bus.off('YQ_head');
+});
+
 function reset() {
   proxy.$refs.layertree.setCheckedKeys([]);
   selectList.value = [];
@@ -193,7 +204,7 @@
   background: rgba(0, 0, 0, 0);
   .el-checkbox__inner {
     background: #0c296a;
-    border: 1px solid #048cff;
+    // border: 1px solid #048cff;
   }
 
   .el-tree-node__content {
@@ -230,7 +241,7 @@
 }
 
 .layericon {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   cursor: pointer;
   width: 40px;
@@ -242,7 +253,7 @@
 }
 
 ::v-deep .LayerControlBox {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   right: 500px;
   top: 175px;
@@ -250,6 +261,7 @@
   background: url('@/assets/images/NewLayercontrol/layerBg.png') no-repeat;
   background-size: 100% 100%;
   width: 170px !important;
+  height: auto;
   max-height: 62vh !important;
   overflow: hidden;
   border-radius: 6px;
@@ -292,7 +304,7 @@
   .ControlBox-body {
     height: calc(100% - 50px);
     overflow: hidden;
-    overflow-y: auto;
+    // overflow-y: auto;
 
     .one-controlbox {
       margin-bottom: 30px;

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/assets/images/donghu/bottombg.png b/src/assets/images/donghu/bottombg.png
new file mode 100644
index 0000000..5fabfc1
--- /dev/null
+++ b/src/assets/images/donghu/bottombg.png
Binary files differ
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index bd3bb73..4b2f79a 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -22,7 +22,7 @@
     .eachClick {
       // width: 64px;
       height: 26px;
-      background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
+      background: linear-gradient(0deg, rgba(0, 98, 183, 0.8) 0%, rgba(0, 98, 183, 0.1) 100%);
       margin-left: 10px;
       padding: 0 12px;
 
@@ -69,9 +69,10 @@
   left: 50%;
   transform: translateX(-50%);
   bottom: 20px;
-  background: linear-gradient(90deg, rgba(11, 18, 28, 0.4) 0%, rgba(48, 58, 69, 0.3) 4100%);
+  background: url('@/assets/images/donghu/bottombg.png') no-repeat;
   background-size: 100% 100%;
   z-index: 10;
+  padding-top: 10px;
 }
 
 .pbottom {
diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue
index def8832..f2d1eda 100644
--- a/src/views/RongyunCommunication/ModalContact/index.vue
+++ b/src/views/RongyunCommunication/ModalContact/index.vue
@@ -4,7 +4,11 @@
     v-model="props.dialogShow"
     title="融云通讯录"
     :close-on-click-modal="false"
+    modal-class="pmpSitNewDialog"
     class="contactBoxRY"
+    append-to-body
+    width="1000px"
+    z-index="9999"
     center
     :before-close="closeDalog"
   >
diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue
index b2b4b17..af92ff6 100644
--- a/src/views/RongyunCommunication/ModelRongYun/index.vue
+++ b/src/views/RongyunCommunication/ModelRongYun/index.vue
@@ -3,7 +3,14 @@
     <!-- 视频弹窗 -->
     <ModalContact :dialogShow="allData.dialogVisible" @dialogHide="dialogHide"></ModalContact>
     <!-- 融云 -->
-    <el-dialog :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" :show-close="false">
+    <el-dialog
+      :close-on-click-modal="false"
+      v-model="RYShow"
+      class="RongYunWindowShow"
+      :show-close="false"
+      append-to-body
+      modal-class="pmpSitNewDialog"
+    >
       <div class="RYdia" v-if="RYShow">
         <div class="topBox">
           <div class="boxName">
@@ -129,6 +136,10 @@
 <style lang="scss" scoped>
 .ModelRongYun {
   line-height: 22px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+
   #TitleDiv {
     width: 100%;
     height: 76px;
diff --git a/src/views/RongyunCommunication/RongYunBox/index.vue b/src/views/RongyunCommunication/RongYunBox/index.vue
index 62deb05..706cb8d 100644
--- a/src/views/RongyunCommunication/RongYunBox/index.vue
+++ b/src/views/RongyunCommunication/RongYunBox/index.vue
@@ -101,8 +101,7 @@
   answer,
   hangUp,
 } from '@/views/RongyunCommunication/rongyunjs/rongyunApi.js';
-// import { listDept } from '@/api/system/dept.js';
-import { findCurrentTreeObj } from '@/utils/util';
+import { findCurrentTreeObj } from '@/utils/ruoyi';
 
 const appStore = useUserStore();
 const useRongyunStore = rongyunStore();
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 6418e50..693890a 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -126,48 +126,59 @@
   const openLayer = _.difference(newVal, oldVal);
   const closeLayer = _.difference(oldVal, newVal);
 
-  function changeyangshi() {
-    const targetElements = document.querySelectorAll('.target-class');
-    targetElements.forEach(target => {
-      const parent = target.parentElement; // 获取父级元素
-      console.log('parent', parent);
-      if (parent) {
-        parent.classList.add('mycustomclass');
-        // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
-        // 你可以在这里设置父级元素的其他样式
-      }
-    });
-  }
-
-  onMounted(() => {
-    nextTick(() => {
-      changeyangshi();
-    });
-    bus.on('YQ_head', val => {
-      if (val == false) {
-        Show.value = false;
-      } else {
-        Show.value = true;
-      }
-    });
-  });
-
-  onBeforeUnmount(() => {
-    bus.off('YQ_head');
-  });
   openLayer.length &&
     openLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? false : true }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? false : true,
+        })
+      );
   closeLayer.length &&
     closeLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? true : false }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? true : false,
+        })
+      );
   newfiberMap.map.triggerRepaint();
 }
 
+function changeyangshi() {
+  const targetElements = document.querySelectorAll('.target-class');
+  targetElements.forEach(target => {
+    const parent = target.parentElement; // 获取父级元素
+    console.log('parent', parent);
+    if (parent) {
+      parent.classList.add('mycustomclass');
+      // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
+      // 你可以在这里设置父级元素的其他样式
+    }
+  });
+}
+
+onMounted(() => {
+  nextTick(() => {
+    changeyangshi();
+  });
+  bus.on('YQ_head', val => {
+    if (val == false) {
+      Show.value = false;
+    } else {
+      Show.value = true;
+    }
+  });
+});
+
+onBeforeUnmount(() => {
+  bus.off('YQ_head');
+});
+
 function reset() {
   proxy.$refs.layertree.setCheckedKeys([]);
   selectList.value = [];
@@ -193,7 +204,7 @@
   background: rgba(0, 0, 0, 0);
   .el-checkbox__inner {
     background: #0c296a;
-    border: 1px solid #048cff;
+    // border: 1px solid #048cff;
   }
 
   .el-tree-node__content {
@@ -230,7 +241,7 @@
 }
 
 .layericon {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   cursor: pointer;
   width: 40px;
@@ -242,7 +253,7 @@
 }
 
 ::v-deep .LayerControlBox {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   right: 500px;
   top: 175px;
@@ -250,6 +261,7 @@
   background: url('@/assets/images/NewLayercontrol/layerBg.png') no-repeat;
   background-size: 100% 100%;
   width: 170px !important;
+  height: auto;
   max-height: 62vh !important;
   overflow: hidden;
   border-radius: 6px;
@@ -292,7 +304,7 @@
   .ControlBox-body {
     height: calc(100% - 50px);
     overflow: hidden;
-    overflow-y: auto;
+    // overflow-y: auto;
 
     .one-controlbox {
       margin-bottom: 30px;
diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 7967938..a043140 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -34,7 +34,9 @@
             {{ item.label }}
           </div>
         </div>
+        <div class="RongYun_icon" @click="dialogShow = !dialogShow"></div>
         <div class="linkicon" @click="Tojiance"></div>
+
         <!-- <div class="weatherBox">
           <img class="weatherImg" :src="getImageUrl(weatherdata?.code || '02', 'pictureOnMap/weather/day')" />
           <div class="weatherText">
@@ -44,6 +46,9 @@
         </div> -->
       </div>
     </div>
+
+    <ModelRongYun :RYdialogShow="dialogShow" @OneDialogHide="dialogHide"></ModelRongYun>
+
     <!-- <div v-show="activeName == 2" class="headBoxTwo">
       <div class="centerbox" @click="BackHouse"></div>
     </div> -->
@@ -53,6 +58,7 @@
 import { ref, reactive, onMounted, onUnmounted } from 'vue';
 import moment from 'moment';
 import { getImageUrl } from '@/utils/ruoyi';
+import ModelRongYun from '@/views/RongyunCommunication/ModelRongYun/index.vue'; //融云调用
 
 import { getweather } from '@/api/MonitorAssetsOnMap';
 import { useRouter } from 'vue-router';
@@ -144,11 +150,7 @@
   return days[new Date().getDay()];
 });
 
-const Tojiance = () => {
-  localStorage.setItem('WB_Brad_in_actived', 1);
-  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap`;
-  window.open(herf, '_self');
-};
+const Tojiance = () => {};
 function weatherForecast() {
   let type = 4;
   let time = moment().format('YYYY-MM-DD');
@@ -166,6 +168,14 @@
     }
   });
 }
+const dialogShow = ref(true);
+
+const dialogHide = val => {
+  if (!val) {
+    dialogShow.value = false;
+  }
+};
+
 onBeforeUnmount(() => {
   bus.off('changeHeadePath');
 });
@@ -370,5 +380,19 @@
     background: url('@/assets/images/pictureOnMap/TOjiance.png') no-repeat;
     background-size: 100% 100%;
   }
+
+  .RongYun_icon {
+    margin-top: 23px;
+    margin-right: 20px;
+    cursor: pointer;
+    width: 25px;
+    height: 25px;
+    background: url('@/assets/images/rongYunImg/RongYun_icon.png') no-repeat;
+    background-size: 100% 100%;
+  }
 }
 </style>
+
+<style lang="scss">
+@import '@/assets/styles/pictureOnMap.scss';
+</style>

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/assets/images/donghu/bottombg.png b/src/assets/images/donghu/bottombg.png
new file mode 100644
index 0000000..5fabfc1
--- /dev/null
+++ b/src/assets/images/donghu/bottombg.png
Binary files differ
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index bd3bb73..4b2f79a 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -22,7 +22,7 @@
     .eachClick {
       // width: 64px;
       height: 26px;
-      background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
+      background: linear-gradient(0deg, rgba(0, 98, 183, 0.8) 0%, rgba(0, 98, 183, 0.1) 100%);
       margin-left: 10px;
       padding: 0 12px;
 
@@ -69,9 +69,10 @@
   left: 50%;
   transform: translateX(-50%);
   bottom: 20px;
-  background: linear-gradient(90deg, rgba(11, 18, 28, 0.4) 0%, rgba(48, 58, 69, 0.3) 4100%);
+  background: url('@/assets/images/donghu/bottombg.png') no-repeat;
   background-size: 100% 100%;
   z-index: 10;
+  padding-top: 10px;
 }
 
 .pbottom {
diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue
index def8832..f2d1eda 100644
--- a/src/views/RongyunCommunication/ModalContact/index.vue
+++ b/src/views/RongyunCommunication/ModalContact/index.vue
@@ -4,7 +4,11 @@
     v-model="props.dialogShow"
     title="融云通讯录"
     :close-on-click-modal="false"
+    modal-class="pmpSitNewDialog"
     class="contactBoxRY"
+    append-to-body
+    width="1000px"
+    z-index="9999"
     center
     :before-close="closeDalog"
   >
diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue
index b2b4b17..af92ff6 100644
--- a/src/views/RongyunCommunication/ModelRongYun/index.vue
+++ b/src/views/RongyunCommunication/ModelRongYun/index.vue
@@ -3,7 +3,14 @@
     <!-- 视频弹窗 -->
     <ModalContact :dialogShow="allData.dialogVisible" @dialogHide="dialogHide"></ModalContact>
     <!-- 融云 -->
-    <el-dialog :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" :show-close="false">
+    <el-dialog
+      :close-on-click-modal="false"
+      v-model="RYShow"
+      class="RongYunWindowShow"
+      :show-close="false"
+      append-to-body
+      modal-class="pmpSitNewDialog"
+    >
       <div class="RYdia" v-if="RYShow">
         <div class="topBox">
           <div class="boxName">
@@ -129,6 +136,10 @@
 <style lang="scss" scoped>
 .ModelRongYun {
   line-height: 22px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+
   #TitleDiv {
     width: 100%;
     height: 76px;
diff --git a/src/views/RongyunCommunication/RongYunBox/index.vue b/src/views/RongyunCommunication/RongYunBox/index.vue
index 62deb05..706cb8d 100644
--- a/src/views/RongyunCommunication/RongYunBox/index.vue
+++ b/src/views/RongyunCommunication/RongYunBox/index.vue
@@ -101,8 +101,7 @@
   answer,
   hangUp,
 } from '@/views/RongyunCommunication/rongyunjs/rongyunApi.js';
-// import { listDept } from '@/api/system/dept.js';
-import { findCurrentTreeObj } from '@/utils/util';
+import { findCurrentTreeObj } from '@/utils/ruoyi';
 
 const appStore = useUserStore();
 const useRongyunStore = rongyunStore();
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 6418e50..693890a 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -126,48 +126,59 @@
   const openLayer = _.difference(newVal, oldVal);
   const closeLayer = _.difference(oldVal, newVal);
 
-  function changeyangshi() {
-    const targetElements = document.querySelectorAll('.target-class');
-    targetElements.forEach(target => {
-      const parent = target.parentElement; // 获取父级元素
-      console.log('parent', parent);
-      if (parent) {
-        parent.classList.add('mycustomclass');
-        // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
-        // 你可以在这里设置父级元素的其他样式
-      }
-    });
-  }
-
-  onMounted(() => {
-    nextTick(() => {
-      changeyangshi();
-    });
-    bus.on('YQ_head', val => {
-      if (val == false) {
-        Show.value = false;
-      } else {
-        Show.value = true;
-      }
-    });
-  });
-
-  onBeforeUnmount(() => {
-    bus.off('YQ_head');
-  });
   openLayer.length &&
     openLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? false : true }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? false : true,
+        })
+      );
   closeLayer.length &&
     closeLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? true : false }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? true : false,
+        })
+      );
   newfiberMap.map.triggerRepaint();
 }
 
+function changeyangshi() {
+  const targetElements = document.querySelectorAll('.target-class');
+  targetElements.forEach(target => {
+    const parent = target.parentElement; // 获取父级元素
+    console.log('parent', parent);
+    if (parent) {
+      parent.classList.add('mycustomclass');
+      // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
+      // 你可以在这里设置父级元素的其他样式
+    }
+  });
+}
+
+onMounted(() => {
+  nextTick(() => {
+    changeyangshi();
+  });
+  bus.on('YQ_head', val => {
+    if (val == false) {
+      Show.value = false;
+    } else {
+      Show.value = true;
+    }
+  });
+});
+
+onBeforeUnmount(() => {
+  bus.off('YQ_head');
+});
+
 function reset() {
   proxy.$refs.layertree.setCheckedKeys([]);
   selectList.value = [];
@@ -193,7 +204,7 @@
   background: rgba(0, 0, 0, 0);
   .el-checkbox__inner {
     background: #0c296a;
-    border: 1px solid #048cff;
+    // border: 1px solid #048cff;
   }
 
   .el-tree-node__content {
@@ -230,7 +241,7 @@
 }
 
 .layericon {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   cursor: pointer;
   width: 40px;
@@ -242,7 +253,7 @@
 }
 
 ::v-deep .LayerControlBox {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   right: 500px;
   top: 175px;
@@ -250,6 +261,7 @@
   background: url('@/assets/images/NewLayercontrol/layerBg.png') no-repeat;
   background-size: 100% 100%;
   width: 170px !important;
+  height: auto;
   max-height: 62vh !important;
   overflow: hidden;
   border-radius: 6px;
@@ -292,7 +304,7 @@
   .ControlBox-body {
     height: calc(100% - 50px);
     overflow: hidden;
-    overflow-y: auto;
+    // overflow-y: auto;
 
     .one-controlbox {
       margin-bottom: 30px;
diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 7967938..a043140 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -34,7 +34,9 @@
             {{ item.label }}
           </div>
         </div>
+        <div class="RongYun_icon" @click="dialogShow = !dialogShow"></div>
         <div class="linkicon" @click="Tojiance"></div>
+
         <!-- <div class="weatherBox">
           <img class="weatherImg" :src="getImageUrl(weatherdata?.code || '02', 'pictureOnMap/weather/day')" />
           <div class="weatherText">
@@ -44,6 +46,9 @@
         </div> -->
       </div>
     </div>
+
+    <ModelRongYun :RYdialogShow="dialogShow" @OneDialogHide="dialogHide"></ModelRongYun>
+
     <!-- <div v-show="activeName == 2" class="headBoxTwo">
       <div class="centerbox" @click="BackHouse"></div>
     </div> -->
@@ -53,6 +58,7 @@
 import { ref, reactive, onMounted, onUnmounted } from 'vue';
 import moment from 'moment';
 import { getImageUrl } from '@/utils/ruoyi';
+import ModelRongYun from '@/views/RongyunCommunication/ModelRongYun/index.vue'; //融云调用
 
 import { getweather } from '@/api/MonitorAssetsOnMap';
 import { useRouter } from 'vue-router';
@@ -144,11 +150,7 @@
   return days[new Date().getDay()];
 });
 
-const Tojiance = () => {
-  localStorage.setItem('WB_Brad_in_actived', 1);
-  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap`;
-  window.open(herf, '_self');
-};
+const Tojiance = () => {};
 function weatherForecast() {
   let type = 4;
   let time = moment().format('YYYY-MM-DD');
@@ -166,6 +168,14 @@
     }
   });
 }
+const dialogShow = ref(true);
+
+const dialogHide = val => {
+  if (!val) {
+    dialogShow.value = false;
+  }
+};
+
 onBeforeUnmount(() => {
   bus.off('changeHeadePath');
 });
@@ -370,5 +380,19 @@
     background: url('@/assets/images/pictureOnMap/TOjiance.png') no-repeat;
     background-size: 100% 100%;
   }
+
+  .RongYun_icon {
+    margin-top: 23px;
+    margin-right: 20px;
+    cursor: pointer;
+    width: 25px;
+    height: 25px;
+    background: url('@/assets/images/rongYunImg/RongYun_icon.png') no-repeat;
+    background-size: 100% 100%;
+  }
 }
 </style>
+
+<style lang="scss">
+@import '@/assets/styles/pictureOnMap.scss';
+</style>
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index a5fdc51..1c9bb2e 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -2,11 +2,7 @@
   <div class="pictureOnMap">
     <TopTab />
     <div class="mainContentBox">
-      <MapBox
-        :initJson="`/static/libs/mapbox/style/wh_dhgx.json`"
-        :loadCallback="loadCallback"
-        @mapClick1="mapClick1"
-      ></MapBox>
+      <MapBox :initJson="`/static/libs/mapbox/style/wh_dhgx.json`" :loadCallback="loadCallback" @mapClick1="mapClick1"></MapBox>
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
@@ -39,19 +35,19 @@
   </div>
 </template>
 <script setup>
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { ref, reactive, onMounted, nextTick } from "vue";
-import TopTab from "./TopTab/index.vue";
-import MapBox from "../../components/Map/MapBox";
-import bus from "@/bus";
-import useUserStore from "@/store/modules/user";
-import DialogTabs from "@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue";
-import { drainageDispatchGetMenu } from "@/api/MonitorAssetsOnMap";
-import recordPage from "@/views/voice/recordPage/index";
-import usepartitionStore from "@/store/modules/partition";
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { ref, reactive, onMounted, nextTick } from 'vue';
+import TopTab from './TopTab/index.vue';
+import MapBox from '../../components/Map/MapBox';
+import bus from '@/bus';
+import useUserStore from '@/store/modules/user';
+import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
+import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import recordPage from '@/views/voice/recordPage/index';
+import usepartitionStore from '@/store/modules/partition';
 
-import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
+import LayerControl from '@/views/pictureOnMap/LayerControl.vue';
 
 const useStore = usepartitionStore();
 
@@ -63,14 +59,14 @@
 const GetcomIDs = ref([]);
 const dialogConfig = reactive({
   visible: false,
-  dataID: "",
-  dataCode: "",
+  dataID: '',
+  dataCode: '',
   data: {},
   comIDs: [],
   customData: [],
-  RefName: "",
-  title: "详情",
-  typeName: "",
+  RefName: '',
+  title: '详情',
+  typeName: '',
 });
 const closediaMeth = () => {
   dialogConfig.visible = false;
@@ -78,72 +74,68 @@
 // 站点数组
 const arrstcode = ref([
   // 站点类型名称: 编码
-  "outlet_water_level", // 排口流量
-  "outlet_quality", // 排口水质
-  "channel_quality", // 港渠水质
-  "channel_water_level", // 港渠水位
-  "lake_water_level", // 湖泊水位
-  "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
-  "rain", // 雨量站
-  "rainwater_pipeline_quality", // 雨水管网水质
-  "sewage_pipeline_quality", // 污水管网水质
-  "rainwater_pipeline_water_level", // 雨水管网液位
-  "reservoir_water_level", //水库水位
-  "rainPumpStation", //雨水泵站
-  "dirtyPumpStation", //污水泵站
-  "sewageStation", //污水厂
-  "gateStation", //闸门
+  'outlet_water_level', // 排口流量
+  'outlet_quality', // 排口水质
+  'channel_quality', // 港渠水质
+  'channel_water_level', // 港渠水位
+  'lake_water_level', // 湖泊水位
+  'waterlogging', // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
+  'rain', // 雨量站
+  'rainwater_pipeline_quality', // 雨水管网水质
+  'sewage_pipeline_quality', // 污水管网水质
+  'rainwater_pipeline_water_level', // 雨水管网液位
+  'reservoir_water_level', //水库水位
+  'rainPumpStation', //雨水泵站
+  'dirtyPumpStation', //污水泵站
+  'sewageStation', //污水厂
+  'gateStation', //闸门
 ]);
 // 基本数据
 const arrid = ref([
-  "diversion_well_info", // 分流井
-  "drainage_info", // 排水户
-  "lake_info", // 湖泊
-  "outlet_info", // 排口
-  "port_channel_info", // 港渠
-  "rain_water_pump_station_info", // 雨水泵站
-  "region_info", // 分区信息
-  "reservoir_info", // 水库
-  "sewage_factory_info", // 污水处理厂
-  "sewage_factory_station_info", //污水处理站
-  "sewage_pump_station_info", // 污水泵站
-  "storage_tank_info", // 调蓄池
-  "water_gate_info", // 水闸
-  "waterlogging_point_info", // 渍水点
-  "water_region_info", // 水系汇水分区
-  "storehouse", //物资仓库
-  "dikeGood", //堤防备料
+  'diversion_well_info', // 分流井
+  'drainage_info', // 排水户
+  'lake_info', // 湖泊
+  'outlet_info', // 排口
+  'port_channel_info', // 港渠
+  'rain_water_pump_station_info', // 雨水泵站
+  'region_info', // 分区信息
+  'reservoir_info', // 水库
+  'sewage_factory_info', // 污水处理厂
+  'sewage_factory_station_info', //污水处理站
+  'sewage_pump_station_info', // 污水泵站
+  'storage_tank_info', // 调蓄池
+  'water_gate_info', // 水闸
+  'waterlogging_point_info', // 渍水点
+  'water_region_info', // 水系汇水分区
+  'storehouse', //物资仓库
+  'dikeGood', //堤防备料
 ]);
 // 基础数据
 const switchStcode = (Name, type) => {
-  if (type == "outlet_info") {
+  if (type == 'outlet_info') {
     pkClick(Getproperties.value);
   }
-  console.log("GetcomIDs.value", GetcomIDs.value);
+  console.log('GetcomIDs.value', GetcomIDs.value);
 
   if (arrid.value.includes(type)) {
     dialogConfig.visible = true;
     dialogConfig.dataCode = type;
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.dataID = Getproperties.value.pid
-      ? Getproperties.value.pid
-      : Getproperties.value.id;
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : '';
   } else {
     return;
   }
 };
 // 类型弹框判断
-const typecodeswitch = (type) => {
+const typecodeswitch = type => {
   if (diabox[type]) {
     // console.log('diabox[type]', diabox[type]);
-    window[type + "_map"] = diabox[type]
-      .filter((i) => i.geometry)
+    window[type + '_map'] = diabox[type]
+      .filter(i => i.geometry)
       .map((item, index) => {
-        let coordinates = turf.getCoords(
-          turf.center(Terraformer.WKT.parse(item.geometry))
-        );
+        let coordinates = turf.getCoords(turf.center(Terraformer.WKT.parse(item.geometry)));
         const popup = new mapboxgl1.Popup({
           closeButton: false,
           closeOnClick: false,
@@ -157,7 +149,7 @@
       });
 
     nextTick(() => {
-      window[type + "_map"].forEach((i) => i._setOpacity(0));
+      window[type + '_map'].forEach(i => i._setOpacity(0));
     });
   }
 };
@@ -165,7 +157,7 @@
   let typearr = [];
   for (var k in diabox) {
     typearr.push(k);
-    appStore.MapData.map((item) => {
+    appStore.MapData.map(item => {
       if (item.pointType == k) {
         diabox[k] = item.data;
       }
@@ -186,56 +178,56 @@
     dialogConfig.dataID = Getproperties.value.stCode;
 
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : '';
   } else {
     return;
   }
 };
 // 智慧水务大脑一张图 特定大屏动态菜单
-const specificFun = (type) => {
+const specificFun = type => {
   // 监测预警模块弹框
   // value值 统一菜单类型
   //name值 特指智慧水务大脑获取的动态菜单类型
   let arr = [
     {
-      name: "dp_zsfx", //渍水点
-      value: "waterlogging",
+      name: 'dp_zsfx', //渍水点
+      value: 'waterlogging',
     },
     {
-      name: "dp_hhsq", //河湖水情
-      value: "lake_water_level",
+      name: 'dp_hhsq', //河湖水情
+      value: 'lake_water_level',
     },
     {
-      name: "dp_bzgq", //泵站工情
-      value: "rainPumpStation", //雨水泵站
+      name: 'dp_bzgq', //泵站工情
+      value: 'rainPumpStation', //雨水泵站
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_water_level", //雨水管网液位
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_water_level', //雨水管网液位
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_wsgwfx", //大屏污水管网风险分析弹框
-      value: "sewage_pipeline_quality", //雨水管网水质
+      name: 'dp_wsgwfx', //大屏污水管网风险分析弹框
+      value: 'sewage_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_ysgwfx', //大屏雨水管网风险分析弹框
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
   ];
-  return arr.find((item) => item.value == type)?.name || null;
+  return arr.find(item => item.value == type)?.name || null;
 };
 
 // 获取动态弹框菜单
 const GetBoxmenu = (Name, type) => {
-  console.log("name", Name);
-  console.log("type", type);
+  console.log('name', Name);
+  console.log('type', type);
   GetcomIDs.value = [];
-  let dataId = "";
+  let dataId = '';
   if (arrstcode.value.includes(type)) {
     dataId = Getproperties.value.stCode;
   }
@@ -243,21 +235,21 @@
   if (arrid.value.includes(type)) {
     dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
   }
-  console.log("dataId", dataId);
+  console.log('dataId', dataId);
   if (!dataId) {
     // proxy.$modal.msgSuccess('');
     return;
   }
   let params = {
     dataCode: specificFun(type) || type,
-    scene: "basis_monitor",
+    scene: 'basis_monitor',
     dataId: dataId,
   };
-  drainageDispatchGetMenu(params).then((res) => {
-    console.log("获得的菜单", res.data);
+  drainageDispatchGetMenu(params).then(res => {
+    console.log('获得的菜单', res.data);
     Getmenuarr.value = res.data;
     if (res.data && res.data.length) {
-      res.data.map((item) => {
+      res.data.map(item => {
         GetcomIDs.value.push(item.moduleName);
       });
     }
@@ -272,112 +264,104 @@
 const pointandlineOpen = (type, properties) => {
   dialogConfig.visible = true;
   switch (type) {
-    case "pipeline_info_text":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info_text':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_info":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_point":
-      dialogConfig.title = "管点信息";
+    case 'pipeline_point':
+      dialogConfig.title = '管点信息';
       break;
-    case "point":
-      dialogConfig.title = "问题管线";
+    case 'point':
+      dialogConfig.title = '问题管线';
       break;
   }
 
   Getmenuarr.value = [
     {
-      menuName: "管网信息",
+      menuName: '管网信息',
       show: true,
-      moduleName: "PointAndLine",
+      moduleName: 'PointAndLine',
     },
   ];
 
   // dialogConfig.dataID = '0371000003';
-  dialogConfig.comIDs = ["PointAndLine"];
-  dialogConfig.RefName = "PointAndLine";
+  dialogConfig.comIDs = ['PointAndLine'];
+  dialogConfig.RefName = 'PointAndLine';
 };
 const loadCallback = () => {};
 // 排口溯源
-const pkClick = async (properties) => {
+const pkClick = async properties => {
   // debugger;
   if (!properties.wellCode) return;
   let results = await upStreamAnalyse({ endPointNumber: properties.wellCode });
   let pipelines = results.data.pipelineInfoList
-    .map((i) =>
+    .map(i =>
       turf.feature(Terraformer.WKT.parse(i.geometrys), {
         ...i,
-        area: i.pipelineType == "Rain" ? "雨水" : "污水",
+        area: i.pipelineType == 'Rain' ? '雨水' : '污水',
       })
     )
-    .map((i) =>
-      i.properties.flowDirection == 0
-        ? turf.lineString(turf.getCoords(i).reverse(), i.properties)
-        : i
-    );
+    .map(i => (i.properties.flowDirection == 0 ? turf.lineString(turf.getCoords(i).reverse(), i.properties) : i));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "水系流向")[0]
+    .filter(i => i.newfiberId == '水系流向')[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 };
 
-const a = (properties) => {
-  const keys_ = ["雨水", "污水"];
-  const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-  bus.emit("removeMapDatas", keys);
+const a = properties => {
+  const keys_ = ['雨水', '污水'];
+  const keys = ['1_泵站', '1_污水处理厂', '分区流向', '分区流向1'];
+  bus.emit('removeMapDatas', keys);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection([]));
   const key = properties.c_layer.includes(keys_[0]) ? keys_[0] : keys_[1];
   const nameKey = properties.name.substring(0, 2);
-  let features = line.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.name.includes(nameKey)
-  );
-  let features1 = point.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.system.includes(nameKey)
-  );
-  let points = _.groupBy(features1, (a) => a.properties.type);
-  features.forEach((i) => {
+  let features = line.features.filter(i => i.properties.area.includes(key) && i.properties.name.includes(nameKey));
+  let features1 = point.features.filter(i => i.properties.area.includes(key) && i.properties.system.includes(nameKey));
+  let points = _.groupBy(features1, a => a.properties.type);
+  features.forEach(i => {
     i.properties.type = keys[2];
-    i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)";
+    i.properties.color = key == keys_[0] ? 'rgba(21,127,176,1)' : 'rgba(255,0,0,1)';
   });
-  Object.keys(points).map((key) =>
-    bus.emit("setGeoJSON", {
+  Object.keys(points).map(key =>
+    bus.emit('setGeoJSON', {
       json: turf.featureCollection(
-        points[key].map((i) => ({
+        points[key].map(i => ({
           type: i.type,
           geometry: i.geometry,
-          properties: { ...i.properties, type: "1_" + key },
+          properties: { ...i.properties, type: '1_' + key },
         }))
       ),
-      key: "1_" + key,
+      key: '1_' + key,
     })
   );
-  bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
+  bus.emit('setGeoJSON', { json: turf.featureCollection(features), key: keys[2] });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection(features));
 };
 
 const mapClick1 = (lngLat, properties = {}, layerId) => {
-  console.log("经纬度", lngLat);
-  console.log("数据", properties);
-  console.log("layerid", layerId);
+  console.log('经纬度', lngLat);
+  console.log('数据', properties);
+  console.log('layerid', layerId);
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : "" || 1;
-  let Name = properties ? properties.pointTypeName : "" || "";
+  let type = properties ? properties.type : '' || 1;
+  let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
-  console.log("1111", type, layerId);
+  console.log('1111', type, layerId);
 
-  if (properties.layer == "排水分区") {
+  if (properties.layer == '排水分区') {
     // a(properties);
 
     // if (Getproperties.value.c_layer.includes('雨水分区_1')) {
@@ -393,24 +377,17 @@
     return;
   }
 
-  let layerIdarr = [
-    "湖泊",
-    "湖泊_text",
-    "港渠",
-    "港渠_text",
-    "水库管理范围",
-    "水库管理范围_text",
-  ];
+  let layerIdarr = ['湖泊', '湖泊_text', '港渠', '港渠_text', '水库管理范围', '水库管理范围_text'];
   let newsetarr = [
-    { name: "湖泊", value: "lake_info" },
-    { name: "湖泊_text", value: "lake_info" },
-    { name: "港渠", value: "port_channel_info" },
-    { name: "港渠_text", value: "port_channel_info" },
-    { name: "水库管理范围", value: "reservoir_info" },
-    { name: "水库管理范围_text", value: "reservoir_info" },
+    { name: '湖泊', value: 'lake_info' },
+    { name: '湖泊_text', value: 'lake_info' },
+    { name: '港渠', value: 'port_channel_info' },
+    { name: '港渠_text', value: 'port_channel_info' },
+    { name: '水库管理范围', value: 'reservoir_info' },
+    { name: '水库管理范围_text', value: 'reservoir_info' },
   ];
   if (layerIdarr.includes(layerId)) {
-    type = newsetarr.find((item) => {
+    type = newsetarr.find(item => {
       return layerId == item.name;
     }).value;
 
@@ -419,15 +396,15 @@
     return;
   }
 
-  let arr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
+  let arr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
 
   if (arr.includes(layerId)) {
-    console.log("进了方法");
+    console.log('进了方法');
     pointandlineOpen(layerId);
     dialogConfig.dataCode = layerId;
-  } else if (properties.type && properties.type == "问题管线") {
-    pointandlineOpen("point");
-    dialogConfig.dataCode = "point";
+  } else if (properties.type && properties.type == '问题管线') {
+    pointandlineOpen('point');
+    dialogConfig.dataCode = 'point';
   } else {
     if (type) {
       GetBoxmenu(Name, type);
@@ -437,30 +414,27 @@
 
 // 根据类型处理接口返回的标注内容
 const AnnotationArr = ref([]);
-const StringName = ref("");
-const Annotation = (properties) => {
+const StringName = ref('');
+const Annotation = properties => {
   if (properties.siteData && properties.siteData.length) {
     let arr = JSON.parse(properties.siteData);
     AnnotationArr.value = arr;
-    console.log("数据", arr);
-    let string = "";
+    console.log('数据', arr);
+    let string = '';
 
     switch (properties.type) {
-      case "rain":
-        AnnotationArr.value = [
-          { valueName: "监测时间", value: properties.recordTime },
-          ...arr,
-        ];
+      case 'rain':
+        AnnotationArr.value = [{ valueName: '监测时间', value: properties.recordTime }, ...arr];
         break;
     }
     string = Methtion(string);
-    console.log("数据", string);
+    console.log('数据', string);
   }
 };
 
-const Methtion = (StringName) => {
+const Methtion = StringName => {
   if (AnnotationArr.value.length) {
-    AnnotationArr.value.map((item) => {
+    AnnotationArr.value.map(item => {
       StringName += `${item.valueName}:${item.value}+'/n' `;
     });
     return StringName;
@@ -477,7 +451,7 @@
     domElement.webkitRequestFullScreen();
   }
 };
-const closeFun = (is) => {
+const closeFun = is => {
   dialogConfig.visible = is;
 };
 function anotherMeht(item) {
@@ -486,12 +460,12 @@
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName;
   Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
-  Getproperties.value.dataId = item.dataId || "";
+  Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
   Getproperties.value.geometry = item.geometry;
   Getproperties.value.waterRegionCode = item.waterRegionCode; //河湖水情  查询水系分区详情
 
-  console.log("Getproperties", Getproperties.value);
+  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
@@ -499,15 +473,15 @@
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
-  GetBoxmenu("", item.stType);
+  GetBoxmenu('', item.stType);
 }
 
 onMounted(() => {
   allScreen();
   useStore.getsewageData();
-  bus.on("DynamicBus", (item) => {
-    console.log("item", item);
-    dialogConfig.RefName = item.RefName || "";
+  bus.on('DynamicBus', item => {
+    console.log('item', item);
+    dialogConfig.RefName = item.RefName || '';
     dialogConfig.title = item.stName || item.name;
     if (!!!item.NoPromise) {
       anotherMeht(item);
@@ -517,31 +491,31 @@
       dialogConfig.visible = true;
       dialogConfig.dataCode = item.type;
       Getmenuarr.value = item.Getmenuarr;
-      dialogConfig.comIDs = ["zhoubianjiejing", "szycfxJCFX"];
-      dialogConfig.title = item.name.split("\n")[0];
+      dialogConfig.comIDs = item.comIDs;
+      dialogConfig.title = item.name.split('\n')[0];
       dialogConfig.dataID = item.pid ? item.pid : item.id;
     }
   });
-  bus.on("closedia", (e) => {
+  bus.on('closedia', e => {
     closediaMeth();
   });
-  bus.on("changeData", (e) => {
+  bus.on('changeData', e => {
     // switchArr();
   });
 });
 
 onBeforeUnmount(() => {
-  bus.off("DynamicBus");
-  bus.off("closedia");
-  bus.off("changeData");
+  bus.off('DynamicBus');
+  bus.off('closedia');
+  bus.off('changeData');
 });
 </script>
 <style lang="scss">
-@import "@/assets/styles/pictureOnMap.scss";
+@import '@/assets/styles/pictureOnMap.scss';
 .pictureOnMap {
   width: 100%;
   height: 100%;
-  background: url("@/assets/images/pictureOnMap/maxBgc.png") no-repeat center;
+  background: url('@/assets/images/pictureOnMap/maxBgc.png') no-repeat center;
   background-size: 100% 100%;
   color: #fff;
   overflow: hidden;

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/assets/images/donghu/bottombg.png b/src/assets/images/donghu/bottombg.png
new file mode 100644
index 0000000..5fabfc1
--- /dev/null
+++ b/src/assets/images/donghu/bottombg.png
Binary files differ
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index bd3bb73..4b2f79a 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -22,7 +22,7 @@
     .eachClick {
       // width: 64px;
       height: 26px;
-      background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
+      background: linear-gradient(0deg, rgba(0, 98, 183, 0.8) 0%, rgba(0, 98, 183, 0.1) 100%);
       margin-left: 10px;
       padding: 0 12px;
 
@@ -69,9 +69,10 @@
   left: 50%;
   transform: translateX(-50%);
   bottom: 20px;
-  background: linear-gradient(90deg, rgba(11, 18, 28, 0.4) 0%, rgba(48, 58, 69, 0.3) 4100%);
+  background: url('@/assets/images/donghu/bottombg.png') no-repeat;
   background-size: 100% 100%;
   z-index: 10;
+  padding-top: 10px;
 }
 
 .pbottom {
diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue
index def8832..f2d1eda 100644
--- a/src/views/RongyunCommunication/ModalContact/index.vue
+++ b/src/views/RongyunCommunication/ModalContact/index.vue
@@ -4,7 +4,11 @@
     v-model="props.dialogShow"
     title="融云通讯录"
     :close-on-click-modal="false"
+    modal-class="pmpSitNewDialog"
     class="contactBoxRY"
+    append-to-body
+    width="1000px"
+    z-index="9999"
     center
     :before-close="closeDalog"
   >
diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue
index b2b4b17..af92ff6 100644
--- a/src/views/RongyunCommunication/ModelRongYun/index.vue
+++ b/src/views/RongyunCommunication/ModelRongYun/index.vue
@@ -3,7 +3,14 @@
     <!-- 视频弹窗 -->
     <ModalContact :dialogShow="allData.dialogVisible" @dialogHide="dialogHide"></ModalContact>
     <!-- 融云 -->
-    <el-dialog :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" :show-close="false">
+    <el-dialog
+      :close-on-click-modal="false"
+      v-model="RYShow"
+      class="RongYunWindowShow"
+      :show-close="false"
+      append-to-body
+      modal-class="pmpSitNewDialog"
+    >
       <div class="RYdia" v-if="RYShow">
         <div class="topBox">
           <div class="boxName">
@@ -129,6 +136,10 @@
 <style lang="scss" scoped>
 .ModelRongYun {
   line-height: 22px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+
   #TitleDiv {
     width: 100%;
     height: 76px;
diff --git a/src/views/RongyunCommunication/RongYunBox/index.vue b/src/views/RongyunCommunication/RongYunBox/index.vue
index 62deb05..706cb8d 100644
--- a/src/views/RongyunCommunication/RongYunBox/index.vue
+++ b/src/views/RongyunCommunication/RongYunBox/index.vue
@@ -101,8 +101,7 @@
   answer,
   hangUp,
 } from '@/views/RongyunCommunication/rongyunjs/rongyunApi.js';
-// import { listDept } from '@/api/system/dept.js';
-import { findCurrentTreeObj } from '@/utils/util';
+import { findCurrentTreeObj } from '@/utils/ruoyi';
 
 const appStore = useUserStore();
 const useRongyunStore = rongyunStore();
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 6418e50..693890a 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -126,48 +126,59 @@
   const openLayer = _.difference(newVal, oldVal);
   const closeLayer = _.difference(oldVal, newVal);
 
-  function changeyangshi() {
-    const targetElements = document.querySelectorAll('.target-class');
-    targetElements.forEach(target => {
-      const parent = target.parentElement; // 获取父级元素
-      console.log('parent', parent);
-      if (parent) {
-        parent.classList.add('mycustomclass');
-        // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
-        // 你可以在这里设置父级元素的其他样式
-      }
-    });
-  }
-
-  onMounted(() => {
-    nextTick(() => {
-      changeyangshi();
-    });
-    bus.on('YQ_head', val => {
-      if (val == false) {
-        Show.value = false;
-      } else {
-        Show.value = true;
-      }
-    });
-  });
-
-  onBeforeUnmount(() => {
-    bus.off('YQ_head');
-  });
   openLayer.length &&
     openLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? false : true }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? false : true,
+        })
+      );
   closeLayer.length &&
     closeLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? true : false }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? true : false,
+        })
+      );
   newfiberMap.map.triggerRepaint();
 }
 
+function changeyangshi() {
+  const targetElements = document.querySelectorAll('.target-class');
+  targetElements.forEach(target => {
+    const parent = target.parentElement; // 获取父级元素
+    console.log('parent', parent);
+    if (parent) {
+      parent.classList.add('mycustomclass');
+      // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
+      // 你可以在这里设置父级元素的其他样式
+    }
+  });
+}
+
+onMounted(() => {
+  nextTick(() => {
+    changeyangshi();
+  });
+  bus.on('YQ_head', val => {
+    if (val == false) {
+      Show.value = false;
+    } else {
+      Show.value = true;
+    }
+  });
+});
+
+onBeforeUnmount(() => {
+  bus.off('YQ_head');
+});
+
 function reset() {
   proxy.$refs.layertree.setCheckedKeys([]);
   selectList.value = [];
@@ -193,7 +204,7 @@
   background: rgba(0, 0, 0, 0);
   .el-checkbox__inner {
     background: #0c296a;
-    border: 1px solid #048cff;
+    // border: 1px solid #048cff;
   }
 
   .el-tree-node__content {
@@ -230,7 +241,7 @@
 }
 
 .layericon {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   cursor: pointer;
   width: 40px;
@@ -242,7 +253,7 @@
 }
 
 ::v-deep .LayerControlBox {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   right: 500px;
   top: 175px;
@@ -250,6 +261,7 @@
   background: url('@/assets/images/NewLayercontrol/layerBg.png') no-repeat;
   background-size: 100% 100%;
   width: 170px !important;
+  height: auto;
   max-height: 62vh !important;
   overflow: hidden;
   border-radius: 6px;
@@ -292,7 +304,7 @@
   .ControlBox-body {
     height: calc(100% - 50px);
     overflow: hidden;
-    overflow-y: auto;
+    // overflow-y: auto;
 
     .one-controlbox {
       margin-bottom: 30px;
diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 7967938..a043140 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -34,7 +34,9 @@
             {{ item.label }}
           </div>
         </div>
+        <div class="RongYun_icon" @click="dialogShow = !dialogShow"></div>
         <div class="linkicon" @click="Tojiance"></div>
+
         <!-- <div class="weatherBox">
           <img class="weatherImg" :src="getImageUrl(weatherdata?.code || '02', 'pictureOnMap/weather/day')" />
           <div class="weatherText">
@@ -44,6 +46,9 @@
         </div> -->
       </div>
     </div>
+
+    <ModelRongYun :RYdialogShow="dialogShow" @OneDialogHide="dialogHide"></ModelRongYun>
+
     <!-- <div v-show="activeName == 2" class="headBoxTwo">
       <div class="centerbox" @click="BackHouse"></div>
     </div> -->
@@ -53,6 +58,7 @@
 import { ref, reactive, onMounted, onUnmounted } from 'vue';
 import moment from 'moment';
 import { getImageUrl } from '@/utils/ruoyi';
+import ModelRongYun from '@/views/RongyunCommunication/ModelRongYun/index.vue'; //融云调用
 
 import { getweather } from '@/api/MonitorAssetsOnMap';
 import { useRouter } from 'vue-router';
@@ -144,11 +150,7 @@
   return days[new Date().getDay()];
 });
 
-const Tojiance = () => {
-  localStorage.setItem('WB_Brad_in_actived', 1);
-  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap`;
-  window.open(herf, '_self');
-};
+const Tojiance = () => {};
 function weatherForecast() {
   let type = 4;
   let time = moment().format('YYYY-MM-DD');
@@ -166,6 +168,14 @@
     }
   });
 }
+const dialogShow = ref(true);
+
+const dialogHide = val => {
+  if (!val) {
+    dialogShow.value = false;
+  }
+};
+
 onBeforeUnmount(() => {
   bus.off('changeHeadePath');
 });
@@ -370,5 +380,19 @@
     background: url('@/assets/images/pictureOnMap/TOjiance.png') no-repeat;
     background-size: 100% 100%;
   }
+
+  .RongYun_icon {
+    margin-top: 23px;
+    margin-right: 20px;
+    cursor: pointer;
+    width: 25px;
+    height: 25px;
+    background: url('@/assets/images/rongYunImg/RongYun_icon.png') no-repeat;
+    background-size: 100% 100%;
+  }
 }
 </style>
+
+<style lang="scss">
+@import '@/assets/styles/pictureOnMap.scss';
+</style>
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index a5fdc51..1c9bb2e 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -2,11 +2,7 @@
   <div class="pictureOnMap">
     <TopTab />
     <div class="mainContentBox">
-      <MapBox
-        :initJson="`/static/libs/mapbox/style/wh_dhgx.json`"
-        :loadCallback="loadCallback"
-        @mapClick1="mapClick1"
-      ></MapBox>
+      <MapBox :initJson="`/static/libs/mapbox/style/wh_dhgx.json`" :loadCallback="loadCallback" @mapClick1="mapClick1"></MapBox>
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
@@ -39,19 +35,19 @@
   </div>
 </template>
 <script setup>
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { ref, reactive, onMounted, nextTick } from "vue";
-import TopTab from "./TopTab/index.vue";
-import MapBox from "../../components/Map/MapBox";
-import bus from "@/bus";
-import useUserStore from "@/store/modules/user";
-import DialogTabs from "@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue";
-import { drainageDispatchGetMenu } from "@/api/MonitorAssetsOnMap";
-import recordPage from "@/views/voice/recordPage/index";
-import usepartitionStore from "@/store/modules/partition";
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { ref, reactive, onMounted, nextTick } from 'vue';
+import TopTab from './TopTab/index.vue';
+import MapBox from '../../components/Map/MapBox';
+import bus from '@/bus';
+import useUserStore from '@/store/modules/user';
+import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
+import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import recordPage from '@/views/voice/recordPage/index';
+import usepartitionStore from '@/store/modules/partition';
 
-import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
+import LayerControl from '@/views/pictureOnMap/LayerControl.vue';
 
 const useStore = usepartitionStore();
 
@@ -63,14 +59,14 @@
 const GetcomIDs = ref([]);
 const dialogConfig = reactive({
   visible: false,
-  dataID: "",
-  dataCode: "",
+  dataID: '',
+  dataCode: '',
   data: {},
   comIDs: [],
   customData: [],
-  RefName: "",
-  title: "详情",
-  typeName: "",
+  RefName: '',
+  title: '详情',
+  typeName: '',
 });
 const closediaMeth = () => {
   dialogConfig.visible = false;
@@ -78,72 +74,68 @@
 // 站点数组
 const arrstcode = ref([
   // 站点类型名称: 编码
-  "outlet_water_level", // 排口流量
-  "outlet_quality", // 排口水质
-  "channel_quality", // 港渠水质
-  "channel_water_level", // 港渠水位
-  "lake_water_level", // 湖泊水位
-  "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
-  "rain", // 雨量站
-  "rainwater_pipeline_quality", // 雨水管网水质
-  "sewage_pipeline_quality", // 污水管网水质
-  "rainwater_pipeline_water_level", // 雨水管网液位
-  "reservoir_water_level", //水库水位
-  "rainPumpStation", //雨水泵站
-  "dirtyPumpStation", //污水泵站
-  "sewageStation", //污水厂
-  "gateStation", //闸门
+  'outlet_water_level', // 排口流量
+  'outlet_quality', // 排口水质
+  'channel_quality', // 港渠水质
+  'channel_water_level', // 港渠水位
+  'lake_water_level', // 湖泊水位
+  'waterlogging', // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
+  'rain', // 雨量站
+  'rainwater_pipeline_quality', // 雨水管网水质
+  'sewage_pipeline_quality', // 污水管网水质
+  'rainwater_pipeline_water_level', // 雨水管网液位
+  'reservoir_water_level', //水库水位
+  'rainPumpStation', //雨水泵站
+  'dirtyPumpStation', //污水泵站
+  'sewageStation', //污水厂
+  'gateStation', //闸门
 ]);
 // 基本数据
 const arrid = ref([
-  "diversion_well_info", // 分流井
-  "drainage_info", // 排水户
-  "lake_info", // 湖泊
-  "outlet_info", // 排口
-  "port_channel_info", // 港渠
-  "rain_water_pump_station_info", // 雨水泵站
-  "region_info", // 分区信息
-  "reservoir_info", // 水库
-  "sewage_factory_info", // 污水处理厂
-  "sewage_factory_station_info", //污水处理站
-  "sewage_pump_station_info", // 污水泵站
-  "storage_tank_info", // 调蓄池
-  "water_gate_info", // 水闸
-  "waterlogging_point_info", // 渍水点
-  "water_region_info", // 水系汇水分区
-  "storehouse", //物资仓库
-  "dikeGood", //堤防备料
+  'diversion_well_info', // 分流井
+  'drainage_info', // 排水户
+  'lake_info', // 湖泊
+  'outlet_info', // 排口
+  'port_channel_info', // 港渠
+  'rain_water_pump_station_info', // 雨水泵站
+  'region_info', // 分区信息
+  'reservoir_info', // 水库
+  'sewage_factory_info', // 污水处理厂
+  'sewage_factory_station_info', //污水处理站
+  'sewage_pump_station_info', // 污水泵站
+  'storage_tank_info', // 调蓄池
+  'water_gate_info', // 水闸
+  'waterlogging_point_info', // 渍水点
+  'water_region_info', // 水系汇水分区
+  'storehouse', //物资仓库
+  'dikeGood', //堤防备料
 ]);
 // 基础数据
 const switchStcode = (Name, type) => {
-  if (type == "outlet_info") {
+  if (type == 'outlet_info') {
     pkClick(Getproperties.value);
   }
-  console.log("GetcomIDs.value", GetcomIDs.value);
+  console.log('GetcomIDs.value', GetcomIDs.value);
 
   if (arrid.value.includes(type)) {
     dialogConfig.visible = true;
     dialogConfig.dataCode = type;
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.dataID = Getproperties.value.pid
-      ? Getproperties.value.pid
-      : Getproperties.value.id;
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : '';
   } else {
     return;
   }
 };
 // 类型弹框判断
-const typecodeswitch = (type) => {
+const typecodeswitch = type => {
   if (diabox[type]) {
     // console.log('diabox[type]', diabox[type]);
-    window[type + "_map"] = diabox[type]
-      .filter((i) => i.geometry)
+    window[type + '_map'] = diabox[type]
+      .filter(i => i.geometry)
       .map((item, index) => {
-        let coordinates = turf.getCoords(
-          turf.center(Terraformer.WKT.parse(item.geometry))
-        );
+        let coordinates = turf.getCoords(turf.center(Terraformer.WKT.parse(item.geometry)));
         const popup = new mapboxgl1.Popup({
           closeButton: false,
           closeOnClick: false,
@@ -157,7 +149,7 @@
       });
 
     nextTick(() => {
-      window[type + "_map"].forEach((i) => i._setOpacity(0));
+      window[type + '_map'].forEach(i => i._setOpacity(0));
     });
   }
 };
@@ -165,7 +157,7 @@
   let typearr = [];
   for (var k in diabox) {
     typearr.push(k);
-    appStore.MapData.map((item) => {
+    appStore.MapData.map(item => {
       if (item.pointType == k) {
         diabox[k] = item.data;
       }
@@ -186,56 +178,56 @@
     dialogConfig.dataID = Getproperties.value.stCode;
 
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : '';
   } else {
     return;
   }
 };
 // 智慧水务大脑一张图 特定大屏动态菜单
-const specificFun = (type) => {
+const specificFun = type => {
   // 监测预警模块弹框
   // value值 统一菜单类型
   //name值 特指智慧水务大脑获取的动态菜单类型
   let arr = [
     {
-      name: "dp_zsfx", //渍水点
-      value: "waterlogging",
+      name: 'dp_zsfx', //渍水点
+      value: 'waterlogging',
     },
     {
-      name: "dp_hhsq", //河湖水情
-      value: "lake_water_level",
+      name: 'dp_hhsq', //河湖水情
+      value: 'lake_water_level',
     },
     {
-      name: "dp_bzgq", //泵站工情
-      value: "rainPumpStation", //雨水泵站
+      name: 'dp_bzgq', //泵站工情
+      value: 'rainPumpStation', //雨水泵站
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_water_level", //雨水管网液位
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_water_level', //雨水管网液位
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_wsgwfx", //大屏污水管网风险分析弹框
-      value: "sewage_pipeline_quality", //雨水管网水质
+      name: 'dp_wsgwfx', //大屏污水管网风险分析弹框
+      value: 'sewage_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_ysgwfx', //大屏雨水管网风险分析弹框
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
   ];
-  return arr.find((item) => item.value == type)?.name || null;
+  return arr.find(item => item.value == type)?.name || null;
 };
 
 // 获取动态弹框菜单
 const GetBoxmenu = (Name, type) => {
-  console.log("name", Name);
-  console.log("type", type);
+  console.log('name', Name);
+  console.log('type', type);
   GetcomIDs.value = [];
-  let dataId = "";
+  let dataId = '';
   if (arrstcode.value.includes(type)) {
     dataId = Getproperties.value.stCode;
   }
@@ -243,21 +235,21 @@
   if (arrid.value.includes(type)) {
     dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
   }
-  console.log("dataId", dataId);
+  console.log('dataId', dataId);
   if (!dataId) {
     // proxy.$modal.msgSuccess('');
     return;
   }
   let params = {
     dataCode: specificFun(type) || type,
-    scene: "basis_monitor",
+    scene: 'basis_monitor',
     dataId: dataId,
   };
-  drainageDispatchGetMenu(params).then((res) => {
-    console.log("获得的菜单", res.data);
+  drainageDispatchGetMenu(params).then(res => {
+    console.log('获得的菜单', res.data);
     Getmenuarr.value = res.data;
     if (res.data && res.data.length) {
-      res.data.map((item) => {
+      res.data.map(item => {
         GetcomIDs.value.push(item.moduleName);
       });
     }
@@ -272,112 +264,104 @@
 const pointandlineOpen = (type, properties) => {
   dialogConfig.visible = true;
   switch (type) {
-    case "pipeline_info_text":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info_text':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_info":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_point":
-      dialogConfig.title = "管点信息";
+    case 'pipeline_point':
+      dialogConfig.title = '管点信息';
       break;
-    case "point":
-      dialogConfig.title = "问题管线";
+    case 'point':
+      dialogConfig.title = '问题管线';
       break;
   }
 
   Getmenuarr.value = [
     {
-      menuName: "管网信息",
+      menuName: '管网信息',
       show: true,
-      moduleName: "PointAndLine",
+      moduleName: 'PointAndLine',
     },
   ];
 
   // dialogConfig.dataID = '0371000003';
-  dialogConfig.comIDs = ["PointAndLine"];
-  dialogConfig.RefName = "PointAndLine";
+  dialogConfig.comIDs = ['PointAndLine'];
+  dialogConfig.RefName = 'PointAndLine';
 };
 const loadCallback = () => {};
 // 排口溯源
-const pkClick = async (properties) => {
+const pkClick = async properties => {
   // debugger;
   if (!properties.wellCode) return;
   let results = await upStreamAnalyse({ endPointNumber: properties.wellCode });
   let pipelines = results.data.pipelineInfoList
-    .map((i) =>
+    .map(i =>
       turf.feature(Terraformer.WKT.parse(i.geometrys), {
         ...i,
-        area: i.pipelineType == "Rain" ? "雨水" : "污水",
+        area: i.pipelineType == 'Rain' ? '雨水' : '污水',
       })
     )
-    .map((i) =>
-      i.properties.flowDirection == 0
-        ? turf.lineString(turf.getCoords(i).reverse(), i.properties)
-        : i
-    );
+    .map(i => (i.properties.flowDirection == 0 ? turf.lineString(turf.getCoords(i).reverse(), i.properties) : i));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "水系流向")[0]
+    .filter(i => i.newfiberId == '水系流向')[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 };
 
-const a = (properties) => {
-  const keys_ = ["雨水", "污水"];
-  const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-  bus.emit("removeMapDatas", keys);
+const a = properties => {
+  const keys_ = ['雨水', '污水'];
+  const keys = ['1_泵站', '1_污水处理厂', '分区流向', '分区流向1'];
+  bus.emit('removeMapDatas', keys);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection([]));
   const key = properties.c_layer.includes(keys_[0]) ? keys_[0] : keys_[1];
   const nameKey = properties.name.substring(0, 2);
-  let features = line.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.name.includes(nameKey)
-  );
-  let features1 = point.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.system.includes(nameKey)
-  );
-  let points = _.groupBy(features1, (a) => a.properties.type);
-  features.forEach((i) => {
+  let features = line.features.filter(i => i.properties.area.includes(key) && i.properties.name.includes(nameKey));
+  let features1 = point.features.filter(i => i.properties.area.includes(key) && i.properties.system.includes(nameKey));
+  let points = _.groupBy(features1, a => a.properties.type);
+  features.forEach(i => {
     i.properties.type = keys[2];
-    i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)";
+    i.properties.color = key == keys_[0] ? 'rgba(21,127,176,1)' : 'rgba(255,0,0,1)';
   });
-  Object.keys(points).map((key) =>
-    bus.emit("setGeoJSON", {
+  Object.keys(points).map(key =>
+    bus.emit('setGeoJSON', {
       json: turf.featureCollection(
-        points[key].map((i) => ({
+        points[key].map(i => ({
           type: i.type,
           geometry: i.geometry,
-          properties: { ...i.properties, type: "1_" + key },
+          properties: { ...i.properties, type: '1_' + key },
         }))
       ),
-      key: "1_" + key,
+      key: '1_' + key,
     })
   );
-  bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
+  bus.emit('setGeoJSON', { json: turf.featureCollection(features), key: keys[2] });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection(features));
 };
 
 const mapClick1 = (lngLat, properties = {}, layerId) => {
-  console.log("经纬度", lngLat);
-  console.log("数据", properties);
-  console.log("layerid", layerId);
+  console.log('经纬度', lngLat);
+  console.log('数据', properties);
+  console.log('layerid', layerId);
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : "" || 1;
-  let Name = properties ? properties.pointTypeName : "" || "";
+  let type = properties ? properties.type : '' || 1;
+  let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
-  console.log("1111", type, layerId);
+  console.log('1111', type, layerId);
 
-  if (properties.layer == "排水分区") {
+  if (properties.layer == '排水分区') {
     // a(properties);
 
     // if (Getproperties.value.c_layer.includes('雨水分区_1')) {
@@ -393,24 +377,17 @@
     return;
   }
 
-  let layerIdarr = [
-    "湖泊",
-    "湖泊_text",
-    "港渠",
-    "港渠_text",
-    "水库管理范围",
-    "水库管理范围_text",
-  ];
+  let layerIdarr = ['湖泊', '湖泊_text', '港渠', '港渠_text', '水库管理范围', '水库管理范围_text'];
   let newsetarr = [
-    { name: "湖泊", value: "lake_info" },
-    { name: "湖泊_text", value: "lake_info" },
-    { name: "港渠", value: "port_channel_info" },
-    { name: "港渠_text", value: "port_channel_info" },
-    { name: "水库管理范围", value: "reservoir_info" },
-    { name: "水库管理范围_text", value: "reservoir_info" },
+    { name: '湖泊', value: 'lake_info' },
+    { name: '湖泊_text', value: 'lake_info' },
+    { name: '港渠', value: 'port_channel_info' },
+    { name: '港渠_text', value: 'port_channel_info' },
+    { name: '水库管理范围', value: 'reservoir_info' },
+    { name: '水库管理范围_text', value: 'reservoir_info' },
   ];
   if (layerIdarr.includes(layerId)) {
-    type = newsetarr.find((item) => {
+    type = newsetarr.find(item => {
       return layerId == item.name;
     }).value;
 
@@ -419,15 +396,15 @@
     return;
   }
 
-  let arr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
+  let arr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
 
   if (arr.includes(layerId)) {
-    console.log("进了方法");
+    console.log('进了方法');
     pointandlineOpen(layerId);
     dialogConfig.dataCode = layerId;
-  } else if (properties.type && properties.type == "问题管线") {
-    pointandlineOpen("point");
-    dialogConfig.dataCode = "point";
+  } else if (properties.type && properties.type == '问题管线') {
+    pointandlineOpen('point');
+    dialogConfig.dataCode = 'point';
   } else {
     if (type) {
       GetBoxmenu(Name, type);
@@ -437,30 +414,27 @@
 
 // 根据类型处理接口返回的标注内容
 const AnnotationArr = ref([]);
-const StringName = ref("");
-const Annotation = (properties) => {
+const StringName = ref('');
+const Annotation = properties => {
   if (properties.siteData && properties.siteData.length) {
     let arr = JSON.parse(properties.siteData);
     AnnotationArr.value = arr;
-    console.log("数据", arr);
-    let string = "";
+    console.log('数据', arr);
+    let string = '';
 
     switch (properties.type) {
-      case "rain":
-        AnnotationArr.value = [
-          { valueName: "监测时间", value: properties.recordTime },
-          ...arr,
-        ];
+      case 'rain':
+        AnnotationArr.value = [{ valueName: '监测时间', value: properties.recordTime }, ...arr];
         break;
     }
     string = Methtion(string);
-    console.log("数据", string);
+    console.log('数据', string);
   }
 };
 
-const Methtion = (StringName) => {
+const Methtion = StringName => {
   if (AnnotationArr.value.length) {
-    AnnotationArr.value.map((item) => {
+    AnnotationArr.value.map(item => {
       StringName += `${item.valueName}:${item.value}+'/n' `;
     });
     return StringName;
@@ -477,7 +451,7 @@
     domElement.webkitRequestFullScreen();
   }
 };
-const closeFun = (is) => {
+const closeFun = is => {
   dialogConfig.visible = is;
 };
 function anotherMeht(item) {
@@ -486,12 +460,12 @@
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName;
   Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
-  Getproperties.value.dataId = item.dataId || "";
+  Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
   Getproperties.value.geometry = item.geometry;
   Getproperties.value.waterRegionCode = item.waterRegionCode; //河湖水情  查询水系分区详情
 
-  console.log("Getproperties", Getproperties.value);
+  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
@@ -499,15 +473,15 @@
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
-  GetBoxmenu("", item.stType);
+  GetBoxmenu('', item.stType);
 }
 
 onMounted(() => {
   allScreen();
   useStore.getsewageData();
-  bus.on("DynamicBus", (item) => {
-    console.log("item", item);
-    dialogConfig.RefName = item.RefName || "";
+  bus.on('DynamicBus', item => {
+    console.log('item', item);
+    dialogConfig.RefName = item.RefName || '';
     dialogConfig.title = item.stName || item.name;
     if (!!!item.NoPromise) {
       anotherMeht(item);
@@ -517,31 +491,31 @@
       dialogConfig.visible = true;
       dialogConfig.dataCode = item.type;
       Getmenuarr.value = item.Getmenuarr;
-      dialogConfig.comIDs = ["zhoubianjiejing", "szycfxJCFX"];
-      dialogConfig.title = item.name.split("\n")[0];
+      dialogConfig.comIDs = item.comIDs;
+      dialogConfig.title = item.name.split('\n')[0];
       dialogConfig.dataID = item.pid ? item.pid : item.id;
     }
   });
-  bus.on("closedia", (e) => {
+  bus.on('closedia', e => {
     closediaMeth();
   });
-  bus.on("changeData", (e) => {
+  bus.on('changeData', e => {
     // switchArr();
   });
 });
 
 onBeforeUnmount(() => {
-  bus.off("DynamicBus");
-  bus.off("closedia");
-  bus.off("changeData");
+  bus.off('DynamicBus');
+  bus.off('closedia');
+  bus.off('changeData');
 });
 </script>
 <style lang="scss">
-@import "@/assets/styles/pictureOnMap.scss";
+@import '@/assets/styles/pictureOnMap.scss';
 .pictureOnMap {
   width: 100%;
   height: 100%;
-  background: url("@/assets/images/pictureOnMap/maxBgc.png") no-repeat center;
+  background: url('@/assets/images/pictureOnMap/maxBgc.png') no-repeat center;
   background-size: 100% 100%;
   color: #fff;
   overflow: hidden;
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 153d2b0..620a129 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -241,9 +241,9 @@
             v-if="dialogConfig.activeName == 'ydfx'"
           ></Ydfx>
         </el-tab-pane>
-        <!-- <el-tab-pane label="测试1" name="yszrfxJCFX">
-          <yszrfxJCFX v-if="dialogConfig.activeName == 'yszrfxJCFX'"></yszrfxJCFX>
-        </el-tab-pane> -->
+        <el-tab-pane label="测试_分析弹窗" name="szycfxJCFX">
+          <szycfxJCFX v-if="dialogConfig.activeName == 'szycfxJCFX'"></szycfxJCFX>
+        </el-tab-pane>
       </el-tabs>
     </el-dialog>
   </div>
@@ -269,15 +269,13 @@
 import Dxssr from "./tab_components/dxssr.vue";
 
 // 测试
-// import yszrfxJCFX from "./../components/DialogTabs/component/yszrfxJCFX.vue";
+import szycfxJCFX from "./../components/DialogTabs/component/szycfxJCFX.vue";
 // 面板控制组件
 import PanelDisplayHidden from "@/views/pictureOnMap/page/components/PanelDisplayHidden.vue";
 const showPanel = ref(false); //面板展开收起
 const PanelChange = (val) => {
   showPanel.value = val;
 };
-// 全景弹窗
-import StreetSpace from "@/components/Map/streetSpace";
 
 const dialogConfig = reactive({
   visible: false,
@@ -487,8 +485,10 @@
 const TypeClick = (item) => {
   let type = item.key;
   bus.emit("clearTemporaryData");
-  AllData.yw_type.forEach((i) => i.value.split(',').forEach(o => operationLayer(o, false)));
-  item.value.split(',').forEach(o => operationLayer(o, true));
+  AllData.yw_type.forEach((i) =>
+    i.value.split(",").forEach((o) => operationLayer(o, false))
+  );
+  item.value.split(",").forEach((o) => operationLayer(o, true));
   AllData.regionGrade = "one";
   AllData.regionName = "";
   newfiberMap.map.easeTo(newfiberMap.config_.params.init);
@@ -1166,7 +1166,9 @@
 
 onBeforeUnmount(() => {
   const { setHighlight } = events_params;
-  AllData.yw_type.forEach((i) => i.value.split(',').forEach(o => operationLayer(o, false)));
+  AllData.yw_type.forEach((i) =>
+    i.value.split(",").forEach((o) => operationLayer(o, false))
+  );
   bus.emit(setHighlight.key, []);
   bus.off("FenQuClick");
   bus.off("openJXFXDialog");

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/assets/images/donghu/bottombg.png b/src/assets/images/donghu/bottombg.png
new file mode 100644
index 0000000..5fabfc1
--- /dev/null
+++ b/src/assets/images/donghu/bottombg.png
Binary files differ
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index bd3bb73..4b2f79a 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -22,7 +22,7 @@
     .eachClick {
       // width: 64px;
       height: 26px;
-      background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
+      background: linear-gradient(0deg, rgba(0, 98, 183, 0.8) 0%, rgba(0, 98, 183, 0.1) 100%);
       margin-left: 10px;
       padding: 0 12px;
 
@@ -69,9 +69,10 @@
   left: 50%;
   transform: translateX(-50%);
   bottom: 20px;
-  background: linear-gradient(90deg, rgba(11, 18, 28, 0.4) 0%, rgba(48, 58, 69, 0.3) 4100%);
+  background: url('@/assets/images/donghu/bottombg.png') no-repeat;
   background-size: 100% 100%;
   z-index: 10;
+  padding-top: 10px;
 }
 
 .pbottom {
diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue
index def8832..f2d1eda 100644
--- a/src/views/RongyunCommunication/ModalContact/index.vue
+++ b/src/views/RongyunCommunication/ModalContact/index.vue
@@ -4,7 +4,11 @@
     v-model="props.dialogShow"
     title="融云通讯录"
     :close-on-click-modal="false"
+    modal-class="pmpSitNewDialog"
     class="contactBoxRY"
+    append-to-body
+    width="1000px"
+    z-index="9999"
     center
     :before-close="closeDalog"
   >
diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue
index b2b4b17..af92ff6 100644
--- a/src/views/RongyunCommunication/ModelRongYun/index.vue
+++ b/src/views/RongyunCommunication/ModelRongYun/index.vue
@@ -3,7 +3,14 @@
     <!-- 视频弹窗 -->
     <ModalContact :dialogShow="allData.dialogVisible" @dialogHide="dialogHide"></ModalContact>
     <!-- 融云 -->
-    <el-dialog :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" :show-close="false">
+    <el-dialog
+      :close-on-click-modal="false"
+      v-model="RYShow"
+      class="RongYunWindowShow"
+      :show-close="false"
+      append-to-body
+      modal-class="pmpSitNewDialog"
+    >
       <div class="RYdia" v-if="RYShow">
         <div class="topBox">
           <div class="boxName">
@@ -129,6 +136,10 @@
 <style lang="scss" scoped>
 .ModelRongYun {
   line-height: 22px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+
   #TitleDiv {
     width: 100%;
     height: 76px;
diff --git a/src/views/RongyunCommunication/RongYunBox/index.vue b/src/views/RongyunCommunication/RongYunBox/index.vue
index 62deb05..706cb8d 100644
--- a/src/views/RongyunCommunication/RongYunBox/index.vue
+++ b/src/views/RongyunCommunication/RongYunBox/index.vue
@@ -101,8 +101,7 @@
   answer,
   hangUp,
 } from '@/views/RongyunCommunication/rongyunjs/rongyunApi.js';
-// import { listDept } from '@/api/system/dept.js';
-import { findCurrentTreeObj } from '@/utils/util';
+import { findCurrentTreeObj } from '@/utils/ruoyi';
 
 const appStore = useUserStore();
 const useRongyunStore = rongyunStore();
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 6418e50..693890a 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -126,48 +126,59 @@
   const openLayer = _.difference(newVal, oldVal);
   const closeLayer = _.difference(oldVal, newVal);
 
-  function changeyangshi() {
-    const targetElements = document.querySelectorAll('.target-class');
-    targetElements.forEach(target => {
-      const parent = target.parentElement; // 获取父级元素
-      console.log('parent', parent);
-      if (parent) {
-        parent.classList.add('mycustomclass');
-        // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
-        // 你可以在这里设置父级元素的其他样式
-      }
-    });
-  }
-
-  onMounted(() => {
-    nextTick(() => {
-      changeyangshi();
-    });
-    bus.on('YQ_head', val => {
-      if (val == false) {
-        Show.value = false;
-      } else {
-        Show.value = true;
-      }
-    });
-  });
-
-  onBeforeUnmount(() => {
-    bus.off('YQ_head');
-  });
   openLayer.length &&
     openLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? false : true }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? false : true,
+        })
+      );
   closeLayer.length &&
     closeLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? true : false }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? true : false,
+        })
+      );
   newfiberMap.map.triggerRepaint();
 }
 
+function changeyangshi() {
+  const targetElements = document.querySelectorAll('.target-class');
+  targetElements.forEach(target => {
+    const parent = target.parentElement; // 获取父级元素
+    console.log('parent', parent);
+    if (parent) {
+      parent.classList.add('mycustomclass');
+      // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
+      // 你可以在这里设置父级元素的其他样式
+    }
+  });
+}
+
+onMounted(() => {
+  nextTick(() => {
+    changeyangshi();
+  });
+  bus.on('YQ_head', val => {
+    if (val == false) {
+      Show.value = false;
+    } else {
+      Show.value = true;
+    }
+  });
+});
+
+onBeforeUnmount(() => {
+  bus.off('YQ_head');
+});
+
 function reset() {
   proxy.$refs.layertree.setCheckedKeys([]);
   selectList.value = [];
@@ -193,7 +204,7 @@
   background: rgba(0, 0, 0, 0);
   .el-checkbox__inner {
     background: #0c296a;
-    border: 1px solid #048cff;
+    // border: 1px solid #048cff;
   }
 
   .el-tree-node__content {
@@ -230,7 +241,7 @@
 }
 
 .layericon {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   cursor: pointer;
   width: 40px;
@@ -242,7 +253,7 @@
 }
 
 ::v-deep .LayerControlBox {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   right: 500px;
   top: 175px;
@@ -250,6 +261,7 @@
   background: url('@/assets/images/NewLayercontrol/layerBg.png') no-repeat;
   background-size: 100% 100%;
   width: 170px !important;
+  height: auto;
   max-height: 62vh !important;
   overflow: hidden;
   border-radius: 6px;
@@ -292,7 +304,7 @@
   .ControlBox-body {
     height: calc(100% - 50px);
     overflow: hidden;
-    overflow-y: auto;
+    // overflow-y: auto;
 
     .one-controlbox {
       margin-bottom: 30px;
diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 7967938..a043140 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -34,7 +34,9 @@
             {{ item.label }}
           </div>
         </div>
+        <div class="RongYun_icon" @click="dialogShow = !dialogShow"></div>
         <div class="linkicon" @click="Tojiance"></div>
+
         <!-- <div class="weatherBox">
           <img class="weatherImg" :src="getImageUrl(weatherdata?.code || '02', 'pictureOnMap/weather/day')" />
           <div class="weatherText">
@@ -44,6 +46,9 @@
         </div> -->
       </div>
     </div>
+
+    <ModelRongYun :RYdialogShow="dialogShow" @OneDialogHide="dialogHide"></ModelRongYun>
+
     <!-- <div v-show="activeName == 2" class="headBoxTwo">
       <div class="centerbox" @click="BackHouse"></div>
     </div> -->
@@ -53,6 +58,7 @@
 import { ref, reactive, onMounted, onUnmounted } from 'vue';
 import moment from 'moment';
 import { getImageUrl } from '@/utils/ruoyi';
+import ModelRongYun from '@/views/RongyunCommunication/ModelRongYun/index.vue'; //融云调用
 
 import { getweather } from '@/api/MonitorAssetsOnMap';
 import { useRouter } from 'vue-router';
@@ -144,11 +150,7 @@
   return days[new Date().getDay()];
 });
 
-const Tojiance = () => {
-  localStorage.setItem('WB_Brad_in_actived', 1);
-  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap`;
-  window.open(herf, '_self');
-};
+const Tojiance = () => {};
 function weatherForecast() {
   let type = 4;
   let time = moment().format('YYYY-MM-DD');
@@ -166,6 +168,14 @@
     }
   });
 }
+const dialogShow = ref(true);
+
+const dialogHide = val => {
+  if (!val) {
+    dialogShow.value = false;
+  }
+};
+
 onBeforeUnmount(() => {
   bus.off('changeHeadePath');
 });
@@ -370,5 +380,19 @@
     background: url('@/assets/images/pictureOnMap/TOjiance.png') no-repeat;
     background-size: 100% 100%;
   }
+
+  .RongYun_icon {
+    margin-top: 23px;
+    margin-right: 20px;
+    cursor: pointer;
+    width: 25px;
+    height: 25px;
+    background: url('@/assets/images/rongYunImg/RongYun_icon.png') no-repeat;
+    background-size: 100% 100%;
+  }
 }
 </style>
+
+<style lang="scss">
+@import '@/assets/styles/pictureOnMap.scss';
+</style>
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index a5fdc51..1c9bb2e 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -2,11 +2,7 @@
   <div class="pictureOnMap">
     <TopTab />
     <div class="mainContentBox">
-      <MapBox
-        :initJson="`/static/libs/mapbox/style/wh_dhgx.json`"
-        :loadCallback="loadCallback"
-        @mapClick1="mapClick1"
-      ></MapBox>
+      <MapBox :initJson="`/static/libs/mapbox/style/wh_dhgx.json`" :loadCallback="loadCallback" @mapClick1="mapClick1"></MapBox>
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
@@ -39,19 +35,19 @@
   </div>
 </template>
 <script setup>
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { ref, reactive, onMounted, nextTick } from "vue";
-import TopTab from "./TopTab/index.vue";
-import MapBox from "../../components/Map/MapBox";
-import bus from "@/bus";
-import useUserStore from "@/store/modules/user";
-import DialogTabs from "@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue";
-import { drainageDispatchGetMenu } from "@/api/MonitorAssetsOnMap";
-import recordPage from "@/views/voice/recordPage/index";
-import usepartitionStore from "@/store/modules/partition";
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { ref, reactive, onMounted, nextTick } from 'vue';
+import TopTab from './TopTab/index.vue';
+import MapBox from '../../components/Map/MapBox';
+import bus from '@/bus';
+import useUserStore from '@/store/modules/user';
+import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
+import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import recordPage from '@/views/voice/recordPage/index';
+import usepartitionStore from '@/store/modules/partition';
 
-import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
+import LayerControl from '@/views/pictureOnMap/LayerControl.vue';
 
 const useStore = usepartitionStore();
 
@@ -63,14 +59,14 @@
 const GetcomIDs = ref([]);
 const dialogConfig = reactive({
   visible: false,
-  dataID: "",
-  dataCode: "",
+  dataID: '',
+  dataCode: '',
   data: {},
   comIDs: [],
   customData: [],
-  RefName: "",
-  title: "详情",
-  typeName: "",
+  RefName: '',
+  title: '详情',
+  typeName: '',
 });
 const closediaMeth = () => {
   dialogConfig.visible = false;
@@ -78,72 +74,68 @@
 // 站点数组
 const arrstcode = ref([
   // 站点类型名称: 编码
-  "outlet_water_level", // 排口流量
-  "outlet_quality", // 排口水质
-  "channel_quality", // 港渠水质
-  "channel_water_level", // 港渠水位
-  "lake_water_level", // 湖泊水位
-  "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
-  "rain", // 雨量站
-  "rainwater_pipeline_quality", // 雨水管网水质
-  "sewage_pipeline_quality", // 污水管网水质
-  "rainwater_pipeline_water_level", // 雨水管网液位
-  "reservoir_water_level", //水库水位
-  "rainPumpStation", //雨水泵站
-  "dirtyPumpStation", //污水泵站
-  "sewageStation", //污水厂
-  "gateStation", //闸门
+  'outlet_water_level', // 排口流量
+  'outlet_quality', // 排口水质
+  'channel_quality', // 港渠水质
+  'channel_water_level', // 港渠水位
+  'lake_water_level', // 湖泊水位
+  'waterlogging', // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
+  'rain', // 雨量站
+  'rainwater_pipeline_quality', // 雨水管网水质
+  'sewage_pipeline_quality', // 污水管网水质
+  'rainwater_pipeline_water_level', // 雨水管网液位
+  'reservoir_water_level', //水库水位
+  'rainPumpStation', //雨水泵站
+  'dirtyPumpStation', //污水泵站
+  'sewageStation', //污水厂
+  'gateStation', //闸门
 ]);
 // 基本数据
 const arrid = ref([
-  "diversion_well_info", // 分流井
-  "drainage_info", // 排水户
-  "lake_info", // 湖泊
-  "outlet_info", // 排口
-  "port_channel_info", // 港渠
-  "rain_water_pump_station_info", // 雨水泵站
-  "region_info", // 分区信息
-  "reservoir_info", // 水库
-  "sewage_factory_info", // 污水处理厂
-  "sewage_factory_station_info", //污水处理站
-  "sewage_pump_station_info", // 污水泵站
-  "storage_tank_info", // 调蓄池
-  "water_gate_info", // 水闸
-  "waterlogging_point_info", // 渍水点
-  "water_region_info", // 水系汇水分区
-  "storehouse", //物资仓库
-  "dikeGood", //堤防备料
+  'diversion_well_info', // 分流井
+  'drainage_info', // 排水户
+  'lake_info', // 湖泊
+  'outlet_info', // 排口
+  'port_channel_info', // 港渠
+  'rain_water_pump_station_info', // 雨水泵站
+  'region_info', // 分区信息
+  'reservoir_info', // 水库
+  'sewage_factory_info', // 污水处理厂
+  'sewage_factory_station_info', //污水处理站
+  'sewage_pump_station_info', // 污水泵站
+  'storage_tank_info', // 调蓄池
+  'water_gate_info', // 水闸
+  'waterlogging_point_info', // 渍水点
+  'water_region_info', // 水系汇水分区
+  'storehouse', //物资仓库
+  'dikeGood', //堤防备料
 ]);
 // 基础数据
 const switchStcode = (Name, type) => {
-  if (type == "outlet_info") {
+  if (type == 'outlet_info') {
     pkClick(Getproperties.value);
   }
-  console.log("GetcomIDs.value", GetcomIDs.value);
+  console.log('GetcomIDs.value', GetcomIDs.value);
 
   if (arrid.value.includes(type)) {
     dialogConfig.visible = true;
     dialogConfig.dataCode = type;
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.dataID = Getproperties.value.pid
-      ? Getproperties.value.pid
-      : Getproperties.value.id;
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : '';
   } else {
     return;
   }
 };
 // 类型弹框判断
-const typecodeswitch = (type) => {
+const typecodeswitch = type => {
   if (diabox[type]) {
     // console.log('diabox[type]', diabox[type]);
-    window[type + "_map"] = diabox[type]
-      .filter((i) => i.geometry)
+    window[type + '_map'] = diabox[type]
+      .filter(i => i.geometry)
       .map((item, index) => {
-        let coordinates = turf.getCoords(
-          turf.center(Terraformer.WKT.parse(item.geometry))
-        );
+        let coordinates = turf.getCoords(turf.center(Terraformer.WKT.parse(item.geometry)));
         const popup = new mapboxgl1.Popup({
           closeButton: false,
           closeOnClick: false,
@@ -157,7 +149,7 @@
       });
 
     nextTick(() => {
-      window[type + "_map"].forEach((i) => i._setOpacity(0));
+      window[type + '_map'].forEach(i => i._setOpacity(0));
     });
   }
 };
@@ -165,7 +157,7 @@
   let typearr = [];
   for (var k in diabox) {
     typearr.push(k);
-    appStore.MapData.map((item) => {
+    appStore.MapData.map(item => {
       if (item.pointType == k) {
         diabox[k] = item.data;
       }
@@ -186,56 +178,56 @@
     dialogConfig.dataID = Getproperties.value.stCode;
 
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : '';
   } else {
     return;
   }
 };
 // 智慧水务大脑一张图 特定大屏动态菜单
-const specificFun = (type) => {
+const specificFun = type => {
   // 监测预警模块弹框
   // value值 统一菜单类型
   //name值 特指智慧水务大脑获取的动态菜单类型
   let arr = [
     {
-      name: "dp_zsfx", //渍水点
-      value: "waterlogging",
+      name: 'dp_zsfx', //渍水点
+      value: 'waterlogging',
     },
     {
-      name: "dp_hhsq", //河湖水情
-      value: "lake_water_level",
+      name: 'dp_hhsq', //河湖水情
+      value: 'lake_water_level',
     },
     {
-      name: "dp_bzgq", //泵站工情
-      value: "rainPumpStation", //雨水泵站
+      name: 'dp_bzgq', //泵站工情
+      value: 'rainPumpStation', //雨水泵站
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_water_level", //雨水管网液位
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_water_level', //雨水管网液位
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_wsgwfx", //大屏污水管网风险分析弹框
-      value: "sewage_pipeline_quality", //雨水管网水质
+      name: 'dp_wsgwfx', //大屏污水管网风险分析弹框
+      value: 'sewage_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_ysgwfx', //大屏雨水管网风险分析弹框
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
   ];
-  return arr.find((item) => item.value == type)?.name || null;
+  return arr.find(item => item.value == type)?.name || null;
 };
 
 // 获取动态弹框菜单
 const GetBoxmenu = (Name, type) => {
-  console.log("name", Name);
-  console.log("type", type);
+  console.log('name', Name);
+  console.log('type', type);
   GetcomIDs.value = [];
-  let dataId = "";
+  let dataId = '';
   if (arrstcode.value.includes(type)) {
     dataId = Getproperties.value.stCode;
   }
@@ -243,21 +235,21 @@
   if (arrid.value.includes(type)) {
     dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
   }
-  console.log("dataId", dataId);
+  console.log('dataId', dataId);
   if (!dataId) {
     // proxy.$modal.msgSuccess('');
     return;
   }
   let params = {
     dataCode: specificFun(type) || type,
-    scene: "basis_monitor",
+    scene: 'basis_monitor',
     dataId: dataId,
   };
-  drainageDispatchGetMenu(params).then((res) => {
-    console.log("获得的菜单", res.data);
+  drainageDispatchGetMenu(params).then(res => {
+    console.log('获得的菜单', res.data);
     Getmenuarr.value = res.data;
     if (res.data && res.data.length) {
-      res.data.map((item) => {
+      res.data.map(item => {
         GetcomIDs.value.push(item.moduleName);
       });
     }
@@ -272,112 +264,104 @@
 const pointandlineOpen = (type, properties) => {
   dialogConfig.visible = true;
   switch (type) {
-    case "pipeline_info_text":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info_text':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_info":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_point":
-      dialogConfig.title = "管点信息";
+    case 'pipeline_point':
+      dialogConfig.title = '管点信息';
       break;
-    case "point":
-      dialogConfig.title = "问题管线";
+    case 'point':
+      dialogConfig.title = '问题管线';
       break;
   }
 
   Getmenuarr.value = [
     {
-      menuName: "管网信息",
+      menuName: '管网信息',
       show: true,
-      moduleName: "PointAndLine",
+      moduleName: 'PointAndLine',
     },
   ];
 
   // dialogConfig.dataID = '0371000003';
-  dialogConfig.comIDs = ["PointAndLine"];
-  dialogConfig.RefName = "PointAndLine";
+  dialogConfig.comIDs = ['PointAndLine'];
+  dialogConfig.RefName = 'PointAndLine';
 };
 const loadCallback = () => {};
 // 排口溯源
-const pkClick = async (properties) => {
+const pkClick = async properties => {
   // debugger;
   if (!properties.wellCode) return;
   let results = await upStreamAnalyse({ endPointNumber: properties.wellCode });
   let pipelines = results.data.pipelineInfoList
-    .map((i) =>
+    .map(i =>
       turf.feature(Terraformer.WKT.parse(i.geometrys), {
         ...i,
-        area: i.pipelineType == "Rain" ? "雨水" : "污水",
+        area: i.pipelineType == 'Rain' ? '雨水' : '污水',
       })
     )
-    .map((i) =>
-      i.properties.flowDirection == 0
-        ? turf.lineString(turf.getCoords(i).reverse(), i.properties)
-        : i
-    );
+    .map(i => (i.properties.flowDirection == 0 ? turf.lineString(turf.getCoords(i).reverse(), i.properties) : i));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "水系流向")[0]
+    .filter(i => i.newfiberId == '水系流向')[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 };
 
-const a = (properties) => {
-  const keys_ = ["雨水", "污水"];
-  const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-  bus.emit("removeMapDatas", keys);
+const a = properties => {
+  const keys_ = ['雨水', '污水'];
+  const keys = ['1_泵站', '1_污水处理厂', '分区流向', '分区流向1'];
+  bus.emit('removeMapDatas', keys);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection([]));
   const key = properties.c_layer.includes(keys_[0]) ? keys_[0] : keys_[1];
   const nameKey = properties.name.substring(0, 2);
-  let features = line.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.name.includes(nameKey)
-  );
-  let features1 = point.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.system.includes(nameKey)
-  );
-  let points = _.groupBy(features1, (a) => a.properties.type);
-  features.forEach((i) => {
+  let features = line.features.filter(i => i.properties.area.includes(key) && i.properties.name.includes(nameKey));
+  let features1 = point.features.filter(i => i.properties.area.includes(key) && i.properties.system.includes(nameKey));
+  let points = _.groupBy(features1, a => a.properties.type);
+  features.forEach(i => {
     i.properties.type = keys[2];
-    i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)";
+    i.properties.color = key == keys_[0] ? 'rgba(21,127,176,1)' : 'rgba(255,0,0,1)';
   });
-  Object.keys(points).map((key) =>
-    bus.emit("setGeoJSON", {
+  Object.keys(points).map(key =>
+    bus.emit('setGeoJSON', {
       json: turf.featureCollection(
-        points[key].map((i) => ({
+        points[key].map(i => ({
           type: i.type,
           geometry: i.geometry,
-          properties: { ...i.properties, type: "1_" + key },
+          properties: { ...i.properties, type: '1_' + key },
         }))
       ),
-      key: "1_" + key,
+      key: '1_' + key,
     })
   );
-  bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
+  bus.emit('setGeoJSON', { json: turf.featureCollection(features), key: keys[2] });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection(features));
 };
 
 const mapClick1 = (lngLat, properties = {}, layerId) => {
-  console.log("经纬度", lngLat);
-  console.log("数据", properties);
-  console.log("layerid", layerId);
+  console.log('经纬度', lngLat);
+  console.log('数据', properties);
+  console.log('layerid', layerId);
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : "" || 1;
-  let Name = properties ? properties.pointTypeName : "" || "";
+  let type = properties ? properties.type : '' || 1;
+  let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
-  console.log("1111", type, layerId);
+  console.log('1111', type, layerId);
 
-  if (properties.layer == "排水分区") {
+  if (properties.layer == '排水分区') {
     // a(properties);
 
     // if (Getproperties.value.c_layer.includes('雨水分区_1')) {
@@ -393,24 +377,17 @@
     return;
   }
 
-  let layerIdarr = [
-    "湖泊",
-    "湖泊_text",
-    "港渠",
-    "港渠_text",
-    "水库管理范围",
-    "水库管理范围_text",
-  ];
+  let layerIdarr = ['湖泊', '湖泊_text', '港渠', '港渠_text', '水库管理范围', '水库管理范围_text'];
   let newsetarr = [
-    { name: "湖泊", value: "lake_info" },
-    { name: "湖泊_text", value: "lake_info" },
-    { name: "港渠", value: "port_channel_info" },
-    { name: "港渠_text", value: "port_channel_info" },
-    { name: "水库管理范围", value: "reservoir_info" },
-    { name: "水库管理范围_text", value: "reservoir_info" },
+    { name: '湖泊', value: 'lake_info' },
+    { name: '湖泊_text', value: 'lake_info' },
+    { name: '港渠', value: 'port_channel_info' },
+    { name: '港渠_text', value: 'port_channel_info' },
+    { name: '水库管理范围', value: 'reservoir_info' },
+    { name: '水库管理范围_text', value: 'reservoir_info' },
   ];
   if (layerIdarr.includes(layerId)) {
-    type = newsetarr.find((item) => {
+    type = newsetarr.find(item => {
       return layerId == item.name;
     }).value;
 
@@ -419,15 +396,15 @@
     return;
   }
 
-  let arr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
+  let arr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
 
   if (arr.includes(layerId)) {
-    console.log("进了方法");
+    console.log('进了方法');
     pointandlineOpen(layerId);
     dialogConfig.dataCode = layerId;
-  } else if (properties.type && properties.type == "问题管线") {
-    pointandlineOpen("point");
-    dialogConfig.dataCode = "point";
+  } else if (properties.type && properties.type == '问题管线') {
+    pointandlineOpen('point');
+    dialogConfig.dataCode = 'point';
   } else {
     if (type) {
       GetBoxmenu(Name, type);
@@ -437,30 +414,27 @@
 
 // 根据类型处理接口返回的标注内容
 const AnnotationArr = ref([]);
-const StringName = ref("");
-const Annotation = (properties) => {
+const StringName = ref('');
+const Annotation = properties => {
   if (properties.siteData && properties.siteData.length) {
     let arr = JSON.parse(properties.siteData);
     AnnotationArr.value = arr;
-    console.log("数据", arr);
-    let string = "";
+    console.log('数据', arr);
+    let string = '';
 
     switch (properties.type) {
-      case "rain":
-        AnnotationArr.value = [
-          { valueName: "监测时间", value: properties.recordTime },
-          ...arr,
-        ];
+      case 'rain':
+        AnnotationArr.value = [{ valueName: '监测时间', value: properties.recordTime }, ...arr];
         break;
     }
     string = Methtion(string);
-    console.log("数据", string);
+    console.log('数据', string);
   }
 };
 
-const Methtion = (StringName) => {
+const Methtion = StringName => {
   if (AnnotationArr.value.length) {
-    AnnotationArr.value.map((item) => {
+    AnnotationArr.value.map(item => {
       StringName += `${item.valueName}:${item.value}+'/n' `;
     });
     return StringName;
@@ -477,7 +451,7 @@
     domElement.webkitRequestFullScreen();
   }
 };
-const closeFun = (is) => {
+const closeFun = is => {
   dialogConfig.visible = is;
 };
 function anotherMeht(item) {
@@ -486,12 +460,12 @@
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName;
   Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
-  Getproperties.value.dataId = item.dataId || "";
+  Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
   Getproperties.value.geometry = item.geometry;
   Getproperties.value.waterRegionCode = item.waterRegionCode; //河湖水情  查询水系分区详情
 
-  console.log("Getproperties", Getproperties.value);
+  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
@@ -499,15 +473,15 @@
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
-  GetBoxmenu("", item.stType);
+  GetBoxmenu('', item.stType);
 }
 
 onMounted(() => {
   allScreen();
   useStore.getsewageData();
-  bus.on("DynamicBus", (item) => {
-    console.log("item", item);
-    dialogConfig.RefName = item.RefName || "";
+  bus.on('DynamicBus', item => {
+    console.log('item', item);
+    dialogConfig.RefName = item.RefName || '';
     dialogConfig.title = item.stName || item.name;
     if (!!!item.NoPromise) {
       anotherMeht(item);
@@ -517,31 +491,31 @@
       dialogConfig.visible = true;
       dialogConfig.dataCode = item.type;
       Getmenuarr.value = item.Getmenuarr;
-      dialogConfig.comIDs = ["zhoubianjiejing", "szycfxJCFX"];
-      dialogConfig.title = item.name.split("\n")[0];
+      dialogConfig.comIDs = item.comIDs;
+      dialogConfig.title = item.name.split('\n')[0];
       dialogConfig.dataID = item.pid ? item.pid : item.id;
     }
   });
-  bus.on("closedia", (e) => {
+  bus.on('closedia', e => {
     closediaMeth();
   });
-  bus.on("changeData", (e) => {
+  bus.on('changeData', e => {
     // switchArr();
   });
 });
 
 onBeforeUnmount(() => {
-  bus.off("DynamicBus");
-  bus.off("closedia");
-  bus.off("changeData");
+  bus.off('DynamicBus');
+  bus.off('closedia');
+  bus.off('changeData');
 });
 </script>
 <style lang="scss">
-@import "@/assets/styles/pictureOnMap.scss";
+@import '@/assets/styles/pictureOnMap.scss';
 .pictureOnMap {
   width: 100%;
   height: 100%;
-  background: url("@/assets/images/pictureOnMap/maxBgc.png") no-repeat center;
+  background: url('@/assets/images/pictureOnMap/maxBgc.png') no-repeat center;
   background-size: 100% 100%;
   color: #fff;
   overflow: hidden;
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 153d2b0..620a129 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -241,9 +241,9 @@
             v-if="dialogConfig.activeName == 'ydfx'"
           ></Ydfx>
         </el-tab-pane>
-        <!-- <el-tab-pane label="测试1" name="yszrfxJCFX">
-          <yszrfxJCFX v-if="dialogConfig.activeName == 'yszrfxJCFX'"></yszrfxJCFX>
-        </el-tab-pane> -->
+        <el-tab-pane label="测试_分析弹窗" name="szycfxJCFX">
+          <szycfxJCFX v-if="dialogConfig.activeName == 'szycfxJCFX'"></szycfxJCFX>
+        </el-tab-pane>
       </el-tabs>
     </el-dialog>
   </div>
@@ -269,15 +269,13 @@
 import Dxssr from "./tab_components/dxssr.vue";
 
 // 测试
-// import yszrfxJCFX from "./../components/DialogTabs/component/yszrfxJCFX.vue";
+import szycfxJCFX from "./../components/DialogTabs/component/szycfxJCFX.vue";
 // 面板控制组件
 import PanelDisplayHidden from "@/views/pictureOnMap/page/components/PanelDisplayHidden.vue";
 const showPanel = ref(false); //面板展开收起
 const PanelChange = (val) => {
   showPanel.value = val;
 };
-// 全景弹窗
-import StreetSpace from "@/components/Map/streetSpace";
 
 const dialogConfig = reactive({
   visible: false,
@@ -487,8 +485,10 @@
 const TypeClick = (item) => {
   let type = item.key;
   bus.emit("clearTemporaryData");
-  AllData.yw_type.forEach((i) => i.value.split(',').forEach(o => operationLayer(o, false)));
-  item.value.split(',').forEach(o => operationLayer(o, true));
+  AllData.yw_type.forEach((i) =>
+    i.value.split(",").forEach((o) => operationLayer(o, false))
+  );
+  item.value.split(",").forEach((o) => operationLayer(o, true));
   AllData.regionGrade = "one";
   AllData.regionName = "";
   newfiberMap.map.easeTo(newfiberMap.config_.params.init);
@@ -1166,7 +1166,9 @@
 
 onBeforeUnmount(() => {
   const { setHighlight } = events_params;
-  AllData.yw_type.forEach((i) => i.value.split(',').forEach(o => operationLayer(o, false)));
+  AllData.yw_type.forEach((i) =>
+    i.value.split(",").forEach((o) => operationLayer(o, false))
+  );
   bus.emit(setHighlight.key, []);
   bus.off("FenQuClick");
   bus.off("openJXFXDialog");
diff --git a/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue b/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue
index a758fc9..718627a 100644
--- a/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue
+++ b/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue
@@ -246,17 +246,23 @@
     height: 30px;
     line-height: 30px;
     text-align: center;
-    background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
-    border-radius: 15px;
-    border: 1px solid #8196b9;
-    color: #8fbffe;
     margin-left: 10px;
-    font-size: 12px;
+    background: linear-gradient(180deg, #0c2156 0%, #2291e1 100%);
+    border-radius: 15px;
+    border: 1px solid #2291e1;
+    // border-image: linear-gradient(0deg, #308fee, #2abffa, #308fee) 10 10;
+    font-family: Source Han Sans CN;
+    font-weight: bold;
+    font-size: 14px;
+    color: #e0e5fa;
 
     &.active {
-      background: linear-gradient(0deg, rgba(81, 136, 176, 0.8) 0%, rgba(126, 214, 255, 0.1) 100%);
+      background: linear-gradient(0deg, #0c3f57 0%, #1dd0c7 100%);
       border-radius: 15px;
-      border: 1px solid #7ed6ff;
+      border: 1px solid #27f1c6;
+      font-family: Source Han Sans CN;
+      font-weight: bold;
+      font-size: 14px;
       color: #ffffff;
     }
   }

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/assets/images/donghu/bottombg.png b/src/assets/images/donghu/bottombg.png
new file mode 100644
index 0000000..5fabfc1
--- /dev/null
+++ b/src/assets/images/donghu/bottombg.png
Binary files differ
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index bd3bb73..4b2f79a 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -22,7 +22,7 @@
     .eachClick {
       // width: 64px;
       height: 26px;
-      background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
+      background: linear-gradient(0deg, rgba(0, 98, 183, 0.8) 0%, rgba(0, 98, 183, 0.1) 100%);
       margin-left: 10px;
       padding: 0 12px;
 
@@ -69,9 +69,10 @@
   left: 50%;
   transform: translateX(-50%);
   bottom: 20px;
-  background: linear-gradient(90deg, rgba(11, 18, 28, 0.4) 0%, rgba(48, 58, 69, 0.3) 4100%);
+  background: url('@/assets/images/donghu/bottombg.png') no-repeat;
   background-size: 100% 100%;
   z-index: 10;
+  padding-top: 10px;
 }
 
 .pbottom {
diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue
index def8832..f2d1eda 100644
--- a/src/views/RongyunCommunication/ModalContact/index.vue
+++ b/src/views/RongyunCommunication/ModalContact/index.vue
@@ -4,7 +4,11 @@
     v-model="props.dialogShow"
     title="融云通讯录"
     :close-on-click-modal="false"
+    modal-class="pmpSitNewDialog"
     class="contactBoxRY"
+    append-to-body
+    width="1000px"
+    z-index="9999"
     center
     :before-close="closeDalog"
   >
diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue
index b2b4b17..af92ff6 100644
--- a/src/views/RongyunCommunication/ModelRongYun/index.vue
+++ b/src/views/RongyunCommunication/ModelRongYun/index.vue
@@ -3,7 +3,14 @@
     <!-- 视频弹窗 -->
     <ModalContact :dialogShow="allData.dialogVisible" @dialogHide="dialogHide"></ModalContact>
     <!-- 融云 -->
-    <el-dialog :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" :show-close="false">
+    <el-dialog
+      :close-on-click-modal="false"
+      v-model="RYShow"
+      class="RongYunWindowShow"
+      :show-close="false"
+      append-to-body
+      modal-class="pmpSitNewDialog"
+    >
       <div class="RYdia" v-if="RYShow">
         <div class="topBox">
           <div class="boxName">
@@ -129,6 +136,10 @@
 <style lang="scss" scoped>
 .ModelRongYun {
   line-height: 22px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+
   #TitleDiv {
     width: 100%;
     height: 76px;
diff --git a/src/views/RongyunCommunication/RongYunBox/index.vue b/src/views/RongyunCommunication/RongYunBox/index.vue
index 62deb05..706cb8d 100644
--- a/src/views/RongyunCommunication/RongYunBox/index.vue
+++ b/src/views/RongyunCommunication/RongYunBox/index.vue
@@ -101,8 +101,7 @@
   answer,
   hangUp,
 } from '@/views/RongyunCommunication/rongyunjs/rongyunApi.js';
-// import { listDept } from '@/api/system/dept.js';
-import { findCurrentTreeObj } from '@/utils/util';
+import { findCurrentTreeObj } from '@/utils/ruoyi';
 
 const appStore = useUserStore();
 const useRongyunStore = rongyunStore();
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 6418e50..693890a 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -126,48 +126,59 @@
   const openLayer = _.difference(newVal, oldVal);
   const closeLayer = _.difference(oldVal, newVal);
 
-  function changeyangshi() {
-    const targetElements = document.querySelectorAll('.target-class');
-    targetElements.forEach(target => {
-      const parent = target.parentElement; // 获取父级元素
-      console.log('parent', parent);
-      if (parent) {
-        parent.classList.add('mycustomclass');
-        // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
-        // 你可以在这里设置父级元素的其他样式
-      }
-    });
-  }
-
-  onMounted(() => {
-    nextTick(() => {
-      changeyangshi();
-    });
-    bus.on('YQ_head', val => {
-      if (val == false) {
-        Show.value = false;
-      } else {
-        Show.value = true;
-      }
-    });
-  });
-
-  onBeforeUnmount(() => {
-    bus.off('YQ_head');
-  });
   openLayer.length &&
     openLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? false : true }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? false : true,
+        })
+      );
   closeLayer.length &&
     closeLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? true : false }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? true : false,
+        })
+      );
   newfiberMap.map.triggerRepaint();
 }
 
+function changeyangshi() {
+  const targetElements = document.querySelectorAll('.target-class');
+  targetElements.forEach(target => {
+    const parent = target.parentElement; // 获取父级元素
+    console.log('parent', parent);
+    if (parent) {
+      parent.classList.add('mycustomclass');
+      // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
+      // 你可以在这里设置父级元素的其他样式
+    }
+  });
+}
+
+onMounted(() => {
+  nextTick(() => {
+    changeyangshi();
+  });
+  bus.on('YQ_head', val => {
+    if (val == false) {
+      Show.value = false;
+    } else {
+      Show.value = true;
+    }
+  });
+});
+
+onBeforeUnmount(() => {
+  bus.off('YQ_head');
+});
+
 function reset() {
   proxy.$refs.layertree.setCheckedKeys([]);
   selectList.value = [];
@@ -193,7 +204,7 @@
   background: rgba(0, 0, 0, 0);
   .el-checkbox__inner {
     background: #0c296a;
-    border: 1px solid #048cff;
+    // border: 1px solid #048cff;
   }
 
   .el-tree-node__content {
@@ -230,7 +241,7 @@
 }
 
 .layericon {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   cursor: pointer;
   width: 40px;
@@ -242,7 +253,7 @@
 }
 
 ::v-deep .LayerControlBox {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   right: 500px;
   top: 175px;
@@ -250,6 +261,7 @@
   background: url('@/assets/images/NewLayercontrol/layerBg.png') no-repeat;
   background-size: 100% 100%;
   width: 170px !important;
+  height: auto;
   max-height: 62vh !important;
   overflow: hidden;
   border-radius: 6px;
@@ -292,7 +304,7 @@
   .ControlBox-body {
     height: calc(100% - 50px);
     overflow: hidden;
-    overflow-y: auto;
+    // overflow-y: auto;
 
     .one-controlbox {
       margin-bottom: 30px;
diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 7967938..a043140 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -34,7 +34,9 @@
             {{ item.label }}
           </div>
         </div>
+        <div class="RongYun_icon" @click="dialogShow = !dialogShow"></div>
         <div class="linkicon" @click="Tojiance"></div>
+
         <!-- <div class="weatherBox">
           <img class="weatherImg" :src="getImageUrl(weatherdata?.code || '02', 'pictureOnMap/weather/day')" />
           <div class="weatherText">
@@ -44,6 +46,9 @@
         </div> -->
       </div>
     </div>
+
+    <ModelRongYun :RYdialogShow="dialogShow" @OneDialogHide="dialogHide"></ModelRongYun>
+
     <!-- <div v-show="activeName == 2" class="headBoxTwo">
       <div class="centerbox" @click="BackHouse"></div>
     </div> -->
@@ -53,6 +58,7 @@
 import { ref, reactive, onMounted, onUnmounted } from 'vue';
 import moment from 'moment';
 import { getImageUrl } from '@/utils/ruoyi';
+import ModelRongYun from '@/views/RongyunCommunication/ModelRongYun/index.vue'; //融云调用
 
 import { getweather } from '@/api/MonitorAssetsOnMap';
 import { useRouter } from 'vue-router';
@@ -144,11 +150,7 @@
   return days[new Date().getDay()];
 });
 
-const Tojiance = () => {
-  localStorage.setItem('WB_Brad_in_actived', 1);
-  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap`;
-  window.open(herf, '_self');
-};
+const Tojiance = () => {};
 function weatherForecast() {
   let type = 4;
   let time = moment().format('YYYY-MM-DD');
@@ -166,6 +168,14 @@
     }
   });
 }
+const dialogShow = ref(true);
+
+const dialogHide = val => {
+  if (!val) {
+    dialogShow.value = false;
+  }
+};
+
 onBeforeUnmount(() => {
   bus.off('changeHeadePath');
 });
@@ -370,5 +380,19 @@
     background: url('@/assets/images/pictureOnMap/TOjiance.png') no-repeat;
     background-size: 100% 100%;
   }
+
+  .RongYun_icon {
+    margin-top: 23px;
+    margin-right: 20px;
+    cursor: pointer;
+    width: 25px;
+    height: 25px;
+    background: url('@/assets/images/rongYunImg/RongYun_icon.png') no-repeat;
+    background-size: 100% 100%;
+  }
 }
 </style>
+
+<style lang="scss">
+@import '@/assets/styles/pictureOnMap.scss';
+</style>
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index a5fdc51..1c9bb2e 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -2,11 +2,7 @@
   <div class="pictureOnMap">
     <TopTab />
     <div class="mainContentBox">
-      <MapBox
-        :initJson="`/static/libs/mapbox/style/wh_dhgx.json`"
-        :loadCallback="loadCallback"
-        @mapClick1="mapClick1"
-      ></MapBox>
+      <MapBox :initJson="`/static/libs/mapbox/style/wh_dhgx.json`" :loadCallback="loadCallback" @mapClick1="mapClick1"></MapBox>
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
@@ -39,19 +35,19 @@
   </div>
 </template>
 <script setup>
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { ref, reactive, onMounted, nextTick } from "vue";
-import TopTab from "./TopTab/index.vue";
-import MapBox from "../../components/Map/MapBox";
-import bus from "@/bus";
-import useUserStore from "@/store/modules/user";
-import DialogTabs from "@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue";
-import { drainageDispatchGetMenu } from "@/api/MonitorAssetsOnMap";
-import recordPage from "@/views/voice/recordPage/index";
-import usepartitionStore from "@/store/modules/partition";
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { ref, reactive, onMounted, nextTick } from 'vue';
+import TopTab from './TopTab/index.vue';
+import MapBox from '../../components/Map/MapBox';
+import bus from '@/bus';
+import useUserStore from '@/store/modules/user';
+import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
+import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import recordPage from '@/views/voice/recordPage/index';
+import usepartitionStore from '@/store/modules/partition';
 
-import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
+import LayerControl from '@/views/pictureOnMap/LayerControl.vue';
 
 const useStore = usepartitionStore();
 
@@ -63,14 +59,14 @@
 const GetcomIDs = ref([]);
 const dialogConfig = reactive({
   visible: false,
-  dataID: "",
-  dataCode: "",
+  dataID: '',
+  dataCode: '',
   data: {},
   comIDs: [],
   customData: [],
-  RefName: "",
-  title: "详情",
-  typeName: "",
+  RefName: '',
+  title: '详情',
+  typeName: '',
 });
 const closediaMeth = () => {
   dialogConfig.visible = false;
@@ -78,72 +74,68 @@
 // 站点数组
 const arrstcode = ref([
   // 站点类型名称: 编码
-  "outlet_water_level", // 排口流量
-  "outlet_quality", // 排口水质
-  "channel_quality", // 港渠水质
-  "channel_water_level", // 港渠水位
-  "lake_water_level", // 湖泊水位
-  "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
-  "rain", // 雨量站
-  "rainwater_pipeline_quality", // 雨水管网水质
-  "sewage_pipeline_quality", // 污水管网水质
-  "rainwater_pipeline_water_level", // 雨水管网液位
-  "reservoir_water_level", //水库水位
-  "rainPumpStation", //雨水泵站
-  "dirtyPumpStation", //污水泵站
-  "sewageStation", //污水厂
-  "gateStation", //闸门
+  'outlet_water_level', // 排口流量
+  'outlet_quality', // 排口水质
+  'channel_quality', // 港渠水质
+  'channel_water_level', // 港渠水位
+  'lake_water_level', // 湖泊水位
+  'waterlogging', // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
+  'rain', // 雨量站
+  'rainwater_pipeline_quality', // 雨水管网水质
+  'sewage_pipeline_quality', // 污水管网水质
+  'rainwater_pipeline_water_level', // 雨水管网液位
+  'reservoir_water_level', //水库水位
+  'rainPumpStation', //雨水泵站
+  'dirtyPumpStation', //污水泵站
+  'sewageStation', //污水厂
+  'gateStation', //闸门
 ]);
 // 基本数据
 const arrid = ref([
-  "diversion_well_info", // 分流井
-  "drainage_info", // 排水户
-  "lake_info", // 湖泊
-  "outlet_info", // 排口
-  "port_channel_info", // 港渠
-  "rain_water_pump_station_info", // 雨水泵站
-  "region_info", // 分区信息
-  "reservoir_info", // 水库
-  "sewage_factory_info", // 污水处理厂
-  "sewage_factory_station_info", //污水处理站
-  "sewage_pump_station_info", // 污水泵站
-  "storage_tank_info", // 调蓄池
-  "water_gate_info", // 水闸
-  "waterlogging_point_info", // 渍水点
-  "water_region_info", // 水系汇水分区
-  "storehouse", //物资仓库
-  "dikeGood", //堤防备料
+  'diversion_well_info', // 分流井
+  'drainage_info', // 排水户
+  'lake_info', // 湖泊
+  'outlet_info', // 排口
+  'port_channel_info', // 港渠
+  'rain_water_pump_station_info', // 雨水泵站
+  'region_info', // 分区信息
+  'reservoir_info', // 水库
+  'sewage_factory_info', // 污水处理厂
+  'sewage_factory_station_info', //污水处理站
+  'sewage_pump_station_info', // 污水泵站
+  'storage_tank_info', // 调蓄池
+  'water_gate_info', // 水闸
+  'waterlogging_point_info', // 渍水点
+  'water_region_info', // 水系汇水分区
+  'storehouse', //物资仓库
+  'dikeGood', //堤防备料
 ]);
 // 基础数据
 const switchStcode = (Name, type) => {
-  if (type == "outlet_info") {
+  if (type == 'outlet_info') {
     pkClick(Getproperties.value);
   }
-  console.log("GetcomIDs.value", GetcomIDs.value);
+  console.log('GetcomIDs.value', GetcomIDs.value);
 
   if (arrid.value.includes(type)) {
     dialogConfig.visible = true;
     dialogConfig.dataCode = type;
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.dataID = Getproperties.value.pid
-      ? Getproperties.value.pid
-      : Getproperties.value.id;
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : '';
   } else {
     return;
   }
 };
 // 类型弹框判断
-const typecodeswitch = (type) => {
+const typecodeswitch = type => {
   if (diabox[type]) {
     // console.log('diabox[type]', diabox[type]);
-    window[type + "_map"] = diabox[type]
-      .filter((i) => i.geometry)
+    window[type + '_map'] = diabox[type]
+      .filter(i => i.geometry)
       .map((item, index) => {
-        let coordinates = turf.getCoords(
-          turf.center(Terraformer.WKT.parse(item.geometry))
-        );
+        let coordinates = turf.getCoords(turf.center(Terraformer.WKT.parse(item.geometry)));
         const popup = new mapboxgl1.Popup({
           closeButton: false,
           closeOnClick: false,
@@ -157,7 +149,7 @@
       });
 
     nextTick(() => {
-      window[type + "_map"].forEach((i) => i._setOpacity(0));
+      window[type + '_map'].forEach(i => i._setOpacity(0));
     });
   }
 };
@@ -165,7 +157,7 @@
   let typearr = [];
   for (var k in diabox) {
     typearr.push(k);
-    appStore.MapData.map((item) => {
+    appStore.MapData.map(item => {
       if (item.pointType == k) {
         diabox[k] = item.data;
       }
@@ -186,56 +178,56 @@
     dialogConfig.dataID = Getproperties.value.stCode;
 
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : '';
   } else {
     return;
   }
 };
 // 智慧水务大脑一张图 特定大屏动态菜单
-const specificFun = (type) => {
+const specificFun = type => {
   // 监测预警模块弹框
   // value值 统一菜单类型
   //name值 特指智慧水务大脑获取的动态菜单类型
   let arr = [
     {
-      name: "dp_zsfx", //渍水点
-      value: "waterlogging",
+      name: 'dp_zsfx', //渍水点
+      value: 'waterlogging',
     },
     {
-      name: "dp_hhsq", //河湖水情
-      value: "lake_water_level",
+      name: 'dp_hhsq', //河湖水情
+      value: 'lake_water_level',
     },
     {
-      name: "dp_bzgq", //泵站工情
-      value: "rainPumpStation", //雨水泵站
+      name: 'dp_bzgq', //泵站工情
+      value: 'rainPumpStation', //雨水泵站
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_water_level", //雨水管网液位
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_water_level', //雨水管网液位
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_wsgwfx", //大屏污水管网风险分析弹框
-      value: "sewage_pipeline_quality", //雨水管网水质
+      name: 'dp_wsgwfx', //大屏污水管网风险分析弹框
+      value: 'sewage_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_ysgwfx', //大屏雨水管网风险分析弹框
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
   ];
-  return arr.find((item) => item.value == type)?.name || null;
+  return arr.find(item => item.value == type)?.name || null;
 };
 
 // 获取动态弹框菜单
 const GetBoxmenu = (Name, type) => {
-  console.log("name", Name);
-  console.log("type", type);
+  console.log('name', Name);
+  console.log('type', type);
   GetcomIDs.value = [];
-  let dataId = "";
+  let dataId = '';
   if (arrstcode.value.includes(type)) {
     dataId = Getproperties.value.stCode;
   }
@@ -243,21 +235,21 @@
   if (arrid.value.includes(type)) {
     dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
   }
-  console.log("dataId", dataId);
+  console.log('dataId', dataId);
   if (!dataId) {
     // proxy.$modal.msgSuccess('');
     return;
   }
   let params = {
     dataCode: specificFun(type) || type,
-    scene: "basis_monitor",
+    scene: 'basis_monitor',
     dataId: dataId,
   };
-  drainageDispatchGetMenu(params).then((res) => {
-    console.log("获得的菜单", res.data);
+  drainageDispatchGetMenu(params).then(res => {
+    console.log('获得的菜单', res.data);
     Getmenuarr.value = res.data;
     if (res.data && res.data.length) {
-      res.data.map((item) => {
+      res.data.map(item => {
         GetcomIDs.value.push(item.moduleName);
       });
     }
@@ -272,112 +264,104 @@
 const pointandlineOpen = (type, properties) => {
   dialogConfig.visible = true;
   switch (type) {
-    case "pipeline_info_text":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info_text':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_info":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_point":
-      dialogConfig.title = "管点信息";
+    case 'pipeline_point':
+      dialogConfig.title = '管点信息';
       break;
-    case "point":
-      dialogConfig.title = "问题管线";
+    case 'point':
+      dialogConfig.title = '问题管线';
       break;
   }
 
   Getmenuarr.value = [
     {
-      menuName: "管网信息",
+      menuName: '管网信息',
       show: true,
-      moduleName: "PointAndLine",
+      moduleName: 'PointAndLine',
     },
   ];
 
   // dialogConfig.dataID = '0371000003';
-  dialogConfig.comIDs = ["PointAndLine"];
-  dialogConfig.RefName = "PointAndLine";
+  dialogConfig.comIDs = ['PointAndLine'];
+  dialogConfig.RefName = 'PointAndLine';
 };
 const loadCallback = () => {};
 // 排口溯源
-const pkClick = async (properties) => {
+const pkClick = async properties => {
   // debugger;
   if (!properties.wellCode) return;
   let results = await upStreamAnalyse({ endPointNumber: properties.wellCode });
   let pipelines = results.data.pipelineInfoList
-    .map((i) =>
+    .map(i =>
       turf.feature(Terraformer.WKT.parse(i.geometrys), {
         ...i,
-        area: i.pipelineType == "Rain" ? "雨水" : "污水",
+        area: i.pipelineType == 'Rain' ? '雨水' : '污水',
       })
     )
-    .map((i) =>
-      i.properties.flowDirection == 0
-        ? turf.lineString(turf.getCoords(i).reverse(), i.properties)
-        : i
-    );
+    .map(i => (i.properties.flowDirection == 0 ? turf.lineString(turf.getCoords(i).reverse(), i.properties) : i));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "水系流向")[0]
+    .filter(i => i.newfiberId == '水系流向')[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 };
 
-const a = (properties) => {
-  const keys_ = ["雨水", "污水"];
-  const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-  bus.emit("removeMapDatas", keys);
+const a = properties => {
+  const keys_ = ['雨水', '污水'];
+  const keys = ['1_泵站', '1_污水处理厂', '分区流向', '分区流向1'];
+  bus.emit('removeMapDatas', keys);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection([]));
   const key = properties.c_layer.includes(keys_[0]) ? keys_[0] : keys_[1];
   const nameKey = properties.name.substring(0, 2);
-  let features = line.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.name.includes(nameKey)
-  );
-  let features1 = point.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.system.includes(nameKey)
-  );
-  let points = _.groupBy(features1, (a) => a.properties.type);
-  features.forEach((i) => {
+  let features = line.features.filter(i => i.properties.area.includes(key) && i.properties.name.includes(nameKey));
+  let features1 = point.features.filter(i => i.properties.area.includes(key) && i.properties.system.includes(nameKey));
+  let points = _.groupBy(features1, a => a.properties.type);
+  features.forEach(i => {
     i.properties.type = keys[2];
-    i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)";
+    i.properties.color = key == keys_[0] ? 'rgba(21,127,176,1)' : 'rgba(255,0,0,1)';
   });
-  Object.keys(points).map((key) =>
-    bus.emit("setGeoJSON", {
+  Object.keys(points).map(key =>
+    bus.emit('setGeoJSON', {
       json: turf.featureCollection(
-        points[key].map((i) => ({
+        points[key].map(i => ({
           type: i.type,
           geometry: i.geometry,
-          properties: { ...i.properties, type: "1_" + key },
+          properties: { ...i.properties, type: '1_' + key },
         }))
       ),
-      key: "1_" + key,
+      key: '1_' + key,
     })
   );
-  bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
+  bus.emit('setGeoJSON', { json: turf.featureCollection(features), key: keys[2] });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection(features));
 };
 
 const mapClick1 = (lngLat, properties = {}, layerId) => {
-  console.log("经纬度", lngLat);
-  console.log("数据", properties);
-  console.log("layerid", layerId);
+  console.log('经纬度', lngLat);
+  console.log('数据', properties);
+  console.log('layerid', layerId);
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : "" || 1;
-  let Name = properties ? properties.pointTypeName : "" || "";
+  let type = properties ? properties.type : '' || 1;
+  let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
-  console.log("1111", type, layerId);
+  console.log('1111', type, layerId);
 
-  if (properties.layer == "排水分区") {
+  if (properties.layer == '排水分区') {
     // a(properties);
 
     // if (Getproperties.value.c_layer.includes('雨水分区_1')) {
@@ -393,24 +377,17 @@
     return;
   }
 
-  let layerIdarr = [
-    "湖泊",
-    "湖泊_text",
-    "港渠",
-    "港渠_text",
-    "水库管理范围",
-    "水库管理范围_text",
-  ];
+  let layerIdarr = ['湖泊', '湖泊_text', '港渠', '港渠_text', '水库管理范围', '水库管理范围_text'];
   let newsetarr = [
-    { name: "湖泊", value: "lake_info" },
-    { name: "湖泊_text", value: "lake_info" },
-    { name: "港渠", value: "port_channel_info" },
-    { name: "港渠_text", value: "port_channel_info" },
-    { name: "水库管理范围", value: "reservoir_info" },
-    { name: "水库管理范围_text", value: "reservoir_info" },
+    { name: '湖泊', value: 'lake_info' },
+    { name: '湖泊_text', value: 'lake_info' },
+    { name: '港渠', value: 'port_channel_info' },
+    { name: '港渠_text', value: 'port_channel_info' },
+    { name: '水库管理范围', value: 'reservoir_info' },
+    { name: '水库管理范围_text', value: 'reservoir_info' },
   ];
   if (layerIdarr.includes(layerId)) {
-    type = newsetarr.find((item) => {
+    type = newsetarr.find(item => {
       return layerId == item.name;
     }).value;
 
@@ -419,15 +396,15 @@
     return;
   }
 
-  let arr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
+  let arr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
 
   if (arr.includes(layerId)) {
-    console.log("进了方法");
+    console.log('进了方法');
     pointandlineOpen(layerId);
     dialogConfig.dataCode = layerId;
-  } else if (properties.type && properties.type == "问题管线") {
-    pointandlineOpen("point");
-    dialogConfig.dataCode = "point";
+  } else if (properties.type && properties.type == '问题管线') {
+    pointandlineOpen('point');
+    dialogConfig.dataCode = 'point';
   } else {
     if (type) {
       GetBoxmenu(Name, type);
@@ -437,30 +414,27 @@
 
 // 根据类型处理接口返回的标注内容
 const AnnotationArr = ref([]);
-const StringName = ref("");
-const Annotation = (properties) => {
+const StringName = ref('');
+const Annotation = properties => {
   if (properties.siteData && properties.siteData.length) {
     let arr = JSON.parse(properties.siteData);
     AnnotationArr.value = arr;
-    console.log("数据", arr);
-    let string = "";
+    console.log('数据', arr);
+    let string = '';
 
     switch (properties.type) {
-      case "rain":
-        AnnotationArr.value = [
-          { valueName: "监测时间", value: properties.recordTime },
-          ...arr,
-        ];
+      case 'rain':
+        AnnotationArr.value = [{ valueName: '监测时间', value: properties.recordTime }, ...arr];
         break;
     }
     string = Methtion(string);
-    console.log("数据", string);
+    console.log('数据', string);
   }
 };
 
-const Methtion = (StringName) => {
+const Methtion = StringName => {
   if (AnnotationArr.value.length) {
-    AnnotationArr.value.map((item) => {
+    AnnotationArr.value.map(item => {
       StringName += `${item.valueName}:${item.value}+'/n' `;
     });
     return StringName;
@@ -477,7 +451,7 @@
     domElement.webkitRequestFullScreen();
   }
 };
-const closeFun = (is) => {
+const closeFun = is => {
   dialogConfig.visible = is;
 };
 function anotherMeht(item) {
@@ -486,12 +460,12 @@
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName;
   Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
-  Getproperties.value.dataId = item.dataId || "";
+  Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
   Getproperties.value.geometry = item.geometry;
   Getproperties.value.waterRegionCode = item.waterRegionCode; //河湖水情  查询水系分区详情
 
-  console.log("Getproperties", Getproperties.value);
+  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
@@ -499,15 +473,15 @@
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
-  GetBoxmenu("", item.stType);
+  GetBoxmenu('', item.stType);
 }
 
 onMounted(() => {
   allScreen();
   useStore.getsewageData();
-  bus.on("DynamicBus", (item) => {
-    console.log("item", item);
-    dialogConfig.RefName = item.RefName || "";
+  bus.on('DynamicBus', item => {
+    console.log('item', item);
+    dialogConfig.RefName = item.RefName || '';
     dialogConfig.title = item.stName || item.name;
     if (!!!item.NoPromise) {
       anotherMeht(item);
@@ -517,31 +491,31 @@
       dialogConfig.visible = true;
       dialogConfig.dataCode = item.type;
       Getmenuarr.value = item.Getmenuarr;
-      dialogConfig.comIDs = ["zhoubianjiejing", "szycfxJCFX"];
-      dialogConfig.title = item.name.split("\n")[0];
+      dialogConfig.comIDs = item.comIDs;
+      dialogConfig.title = item.name.split('\n')[0];
       dialogConfig.dataID = item.pid ? item.pid : item.id;
     }
   });
-  bus.on("closedia", (e) => {
+  bus.on('closedia', e => {
     closediaMeth();
   });
-  bus.on("changeData", (e) => {
+  bus.on('changeData', e => {
     // switchArr();
   });
 });
 
 onBeforeUnmount(() => {
-  bus.off("DynamicBus");
-  bus.off("closedia");
-  bus.off("changeData");
+  bus.off('DynamicBus');
+  bus.off('closedia');
+  bus.off('changeData');
 });
 </script>
 <style lang="scss">
-@import "@/assets/styles/pictureOnMap.scss";
+@import '@/assets/styles/pictureOnMap.scss';
 .pictureOnMap {
   width: 100%;
   height: 100%;
-  background: url("@/assets/images/pictureOnMap/maxBgc.png") no-repeat center;
+  background: url('@/assets/images/pictureOnMap/maxBgc.png') no-repeat center;
   background-size: 100% 100%;
   color: #fff;
   overflow: hidden;
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 153d2b0..620a129 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -241,9 +241,9 @@
             v-if="dialogConfig.activeName == 'ydfx'"
           ></Ydfx>
         </el-tab-pane>
-        <!-- <el-tab-pane label="测试1" name="yszrfxJCFX">
-          <yszrfxJCFX v-if="dialogConfig.activeName == 'yszrfxJCFX'"></yszrfxJCFX>
-        </el-tab-pane> -->
+        <el-tab-pane label="测试_分析弹窗" name="szycfxJCFX">
+          <szycfxJCFX v-if="dialogConfig.activeName == 'szycfxJCFX'"></szycfxJCFX>
+        </el-tab-pane>
       </el-tabs>
     </el-dialog>
   </div>
@@ -269,15 +269,13 @@
 import Dxssr from "./tab_components/dxssr.vue";
 
 // 测试
-// import yszrfxJCFX from "./../components/DialogTabs/component/yszrfxJCFX.vue";
+import szycfxJCFX from "./../components/DialogTabs/component/szycfxJCFX.vue";
 // 面板控制组件
 import PanelDisplayHidden from "@/views/pictureOnMap/page/components/PanelDisplayHidden.vue";
 const showPanel = ref(false); //面板展开收起
 const PanelChange = (val) => {
   showPanel.value = val;
 };
-// 全景弹窗
-import StreetSpace from "@/components/Map/streetSpace";
 
 const dialogConfig = reactive({
   visible: false,
@@ -487,8 +485,10 @@
 const TypeClick = (item) => {
   let type = item.key;
   bus.emit("clearTemporaryData");
-  AllData.yw_type.forEach((i) => i.value.split(',').forEach(o => operationLayer(o, false)));
-  item.value.split(',').forEach(o => operationLayer(o, true));
+  AllData.yw_type.forEach((i) =>
+    i.value.split(",").forEach((o) => operationLayer(o, false))
+  );
+  item.value.split(",").forEach((o) => operationLayer(o, true));
   AllData.regionGrade = "one";
   AllData.regionName = "";
   newfiberMap.map.easeTo(newfiberMap.config_.params.init);
@@ -1166,7 +1166,9 @@
 
 onBeforeUnmount(() => {
   const { setHighlight } = events_params;
-  AllData.yw_type.forEach((i) => i.value.split(',').forEach(o => operationLayer(o, false)));
+  AllData.yw_type.forEach((i) =>
+    i.value.split(",").forEach((o) => operationLayer(o, false))
+  );
   bus.emit(setHighlight.key, []);
   bus.off("FenQuClick");
   bus.off("openJXFXDialog");
diff --git a/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue b/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue
index a758fc9..718627a 100644
--- a/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue
+++ b/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue
@@ -246,17 +246,23 @@
     height: 30px;
     line-height: 30px;
     text-align: center;
-    background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
-    border-radius: 15px;
-    border: 1px solid #8196b9;
-    color: #8fbffe;
     margin-left: 10px;
-    font-size: 12px;
+    background: linear-gradient(180deg, #0c2156 0%, #2291e1 100%);
+    border-radius: 15px;
+    border: 1px solid #2291e1;
+    // border-image: linear-gradient(0deg, #308fee, #2abffa, #308fee) 10 10;
+    font-family: Source Han Sans CN;
+    font-weight: bold;
+    font-size: 14px;
+    color: #e0e5fa;
 
     &.active {
-      background: linear-gradient(0deg, rgba(81, 136, 176, 0.8) 0%, rgba(126, 214, 255, 0.1) 100%);
+      background: linear-gradient(0deg, #0c3f57 0%, #1dd0c7 100%);
       border-radius: 15px;
-      border: 1px solid #7ed6ff;
+      border: 1px solid #27f1c6;
+      font-family: Source Han Sans CN;
+      font-weight: bold;
+      font-size: 14px;
       color: #ffffff;
     }
   }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index 6ed6ee8..e52f4ed 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -29,6 +29,7 @@
 import { ref, reactive, toRefs, onMounted, nextTick } from "vue";
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
+import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
 const props = defineProps({
   // 数据id
   dataID: {
@@ -355,22 +356,36 @@
   }
 };
 const getChartsData = () => {
-  console.log(props);
   getEchart({
-    stType: props.Getproperties.stType,
-    stCode: props.Getproperties.stCode,
-    dataCode: props.Getproperties.dataCode,
-    start: "2024-07-01 00:00:00",
-    end: "2024-07-01 23:59:59",
+    // stType: props.Getproperties.stType,
+    // stCode: props.Getproperties.stCode,
+    // dataCode: props.Getproperties.dataCode,
+    // start: "2024-07-01 00:00:00",
+    // end: "2024-07-01 23:59:59",
+    stType: "rainwater_pipeline_quality",
+    stCode: "0201460323",
+    dataCode: "pipePoint",
+    start: "2024-11-26 11:10:03",
+    end: "2024-11-27 11:10:03",
   }).then((res) => {
     if (res && res.code == 200) {
       init();
     }
   });
 };
+const getFenXiData = () => {
+  console.log(props);
+  riskAnalysisReason({
+    startTime: "2024-07-01 00:00:00",
+    endTime: "2024-07-01 23:59:59",
+    stCode: "",
+    menuType: "",
+  }).then((res) => {});
+};
 onMounted(() => {
   nextTick(() => {
     getChartsData();
+    getFenXiData();
     window.addEventListener("resize", resizeTheChart);
   });
 });

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 0ab65a9..f5c8599 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -41,11 +41,18 @@
   });
 }
 // 获取列表数据
-
 export function listPipelineDefectRisk(params) {
   return request({
     url: `business/monitorAnalysis/listPipelineDefectRisk`,
     method: 'get',
     params,
   });
+}
+// 获取列表数据
+export function riskAnalysisReason(params) {
+  return request({
+    url: `business/monitorAnalysis/riskAnalysisReason`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/assets/images/donghu/bottombg.png b/src/assets/images/donghu/bottombg.png
new file mode 100644
index 0000000..5fabfc1
--- /dev/null
+++ b/src/assets/images/donghu/bottombg.png
Binary files differ
diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss
index bd3bb73..4b2f79a 100644
--- a/src/assets/styles/WaterAssets.scss
+++ b/src/assets/styles/WaterAssets.scss
@@ -22,7 +22,7 @@
     .eachClick {
       // width: 64px;
       height: 26px;
-      background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
+      background: linear-gradient(0deg, rgba(0, 98, 183, 0.8) 0%, rgba(0, 98, 183, 0.1) 100%);
       margin-left: 10px;
       padding: 0 12px;
 
@@ -69,9 +69,10 @@
   left: 50%;
   transform: translateX(-50%);
   bottom: 20px;
-  background: linear-gradient(90deg, rgba(11, 18, 28, 0.4) 0%, rgba(48, 58, 69, 0.3) 4100%);
+  background: url('@/assets/images/donghu/bottombg.png') no-repeat;
   background-size: 100% 100%;
   z-index: 10;
+  padding-top: 10px;
 }
 
 .pbottom {
diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue
index def8832..f2d1eda 100644
--- a/src/views/RongyunCommunication/ModalContact/index.vue
+++ b/src/views/RongyunCommunication/ModalContact/index.vue
@@ -4,7 +4,11 @@
     v-model="props.dialogShow"
     title="融云通讯录"
     :close-on-click-modal="false"
+    modal-class="pmpSitNewDialog"
     class="contactBoxRY"
+    append-to-body
+    width="1000px"
+    z-index="9999"
     center
     :before-close="closeDalog"
   >
diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue
index b2b4b17..af92ff6 100644
--- a/src/views/RongyunCommunication/ModelRongYun/index.vue
+++ b/src/views/RongyunCommunication/ModelRongYun/index.vue
@@ -3,7 +3,14 @@
     <!-- 视频弹窗 -->
     <ModalContact :dialogShow="allData.dialogVisible" @dialogHide="dialogHide"></ModalContact>
     <!-- 融云 -->
-    <el-dialog :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" :show-close="false">
+    <el-dialog
+      :close-on-click-modal="false"
+      v-model="RYShow"
+      class="RongYunWindowShow"
+      :show-close="false"
+      append-to-body
+      modal-class="pmpSitNewDialog"
+    >
       <div class="RYdia" v-if="RYShow">
         <div class="topBox">
           <div class="boxName">
@@ -129,6 +136,10 @@
 <style lang="scss" scoped>
 .ModelRongYun {
   line-height: 22px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+
   #TitleDiv {
     width: 100%;
     height: 76px;
diff --git a/src/views/RongyunCommunication/RongYunBox/index.vue b/src/views/RongyunCommunication/RongYunBox/index.vue
index 62deb05..706cb8d 100644
--- a/src/views/RongyunCommunication/RongYunBox/index.vue
+++ b/src/views/RongyunCommunication/RongYunBox/index.vue
@@ -101,8 +101,7 @@
   answer,
   hangUp,
 } from '@/views/RongyunCommunication/rongyunjs/rongyunApi.js';
-// import { listDept } from '@/api/system/dept.js';
-import { findCurrentTreeObj } from '@/utils/util';
+import { findCurrentTreeObj } from '@/utils/ruoyi';
 
 const appStore = useUserStore();
 const useRongyunStore = rongyunStore();
diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue
index 6418e50..693890a 100644
--- a/src/views/pictureOnMap/LayerControl.vue
+++ b/src/views/pictureOnMap/LayerControl.vue
@@ -126,48 +126,59 @@
   const openLayer = _.difference(newVal, oldVal);
   const closeLayer = _.difference(oldVal, newVal);
 
-  function changeyangshi() {
-    const targetElements = document.querySelectorAll('.target-class');
-    targetElements.forEach(target => {
-      const parent = target.parentElement; // 获取父级元素
-      console.log('parent', parent);
-      if (parent) {
-        parent.classList.add('mycustomclass');
-        // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
-        // 你可以在这里设置父级元素的其他样式
-      }
-    });
-  }
-
-  onMounted(() => {
-    nextTick(() => {
-      changeyangshi();
-    });
-    bus.on('YQ_head', val => {
-      if (val == false) {
-        Show.value = false;
-      } else {
-        Show.value = true;
-      }
-    });
-  });
-
-  onBeforeUnmount(() => {
-    bus.off('YQ_head');
-  });
   openLayer.length &&
     openLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? false : true }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? false : true,
+        })
+      );
   closeLayer.length &&
     closeLayer
       .map(i => i.split(','))
       .flat(Infinity)
-      .forEach(key => bus.emit('setLayerVisible', { layername: key, isCheck: key.includes('!') ? true : false }));
+      .forEach(key =>
+        bus.emit('setLayerVisible', {
+          layername: key,
+          isCheck: key.includes('!') ? true : false,
+        })
+      );
   newfiberMap.map.triggerRepaint();
 }
 
+function changeyangshi() {
+  const targetElements = document.querySelectorAll('.target-class');
+  targetElements.forEach(target => {
+    const parent = target.parentElement; // 获取父级元素
+    console.log('parent', parent);
+    if (parent) {
+      parent.classList.add('mycustomclass');
+      // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式
+      // 你可以在这里设置父级元素的其他样式
+    }
+  });
+}
+
+onMounted(() => {
+  nextTick(() => {
+    changeyangshi();
+  });
+  bus.on('YQ_head', val => {
+    if (val == false) {
+      Show.value = false;
+    } else {
+      Show.value = true;
+    }
+  });
+});
+
+onBeforeUnmount(() => {
+  bus.off('YQ_head');
+});
+
 function reset() {
   proxy.$refs.layertree.setCheckedKeys([]);
   selectList.value = [];
@@ -193,7 +204,7 @@
   background: rgba(0, 0, 0, 0);
   .el-checkbox__inner {
     background: #0c296a;
-    border: 1px solid #048cff;
+    // border: 1px solid #048cff;
   }
 
   .el-tree-node__content {
@@ -230,7 +241,7 @@
 }
 
 .layericon {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   cursor: pointer;
   width: 40px;
@@ -242,7 +253,7 @@
 }
 
 ::v-deep .LayerControlBox {
-  z-index: 2000;
+  z-index: 0;
   position: absolute;
   right: 500px;
   top: 175px;
@@ -250,6 +261,7 @@
   background: url('@/assets/images/NewLayercontrol/layerBg.png') no-repeat;
   background-size: 100% 100%;
   width: 170px !important;
+  height: auto;
   max-height: 62vh !important;
   overflow: hidden;
   border-radius: 6px;
@@ -292,7 +304,7 @@
   .ControlBox-body {
     height: calc(100% - 50px);
     overflow: hidden;
-    overflow-y: auto;
+    // overflow-y: auto;
 
     .one-controlbox {
       margin-bottom: 30px;
diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 7967938..a043140 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -34,7 +34,9 @@
             {{ item.label }}
           </div>
         </div>
+        <div class="RongYun_icon" @click="dialogShow = !dialogShow"></div>
         <div class="linkicon" @click="Tojiance"></div>
+
         <!-- <div class="weatherBox">
           <img class="weatherImg" :src="getImageUrl(weatherdata?.code || '02', 'pictureOnMap/weather/day')" />
           <div class="weatherText">
@@ -44,6 +46,9 @@
         </div> -->
       </div>
     </div>
+
+    <ModelRongYun :RYdialogShow="dialogShow" @OneDialogHide="dialogHide"></ModelRongYun>
+
     <!-- <div v-show="activeName == 2" class="headBoxTwo">
       <div class="centerbox" @click="BackHouse"></div>
     </div> -->
@@ -53,6 +58,7 @@
 import { ref, reactive, onMounted, onUnmounted } from 'vue';
 import moment from 'moment';
 import { getImageUrl } from '@/utils/ruoyi';
+import ModelRongYun from '@/views/RongyunCommunication/ModelRongYun/index.vue'; //融云调用
 
 import { getweather } from '@/api/MonitorAssetsOnMap';
 import { useRouter } from 'vue-router';
@@ -144,11 +150,7 @@
   return days[new Date().getDay()];
 });
 
-const Tojiance = () => {
-  localStorage.setItem('WB_Brad_in_actived', 1);
-  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap`;
-  window.open(herf, '_self');
-};
+const Tojiance = () => {};
 function weatherForecast() {
   let type = 4;
   let time = moment().format('YYYY-MM-DD');
@@ -166,6 +168,14 @@
     }
   });
 }
+const dialogShow = ref(true);
+
+const dialogHide = val => {
+  if (!val) {
+    dialogShow.value = false;
+  }
+};
+
 onBeforeUnmount(() => {
   bus.off('changeHeadePath');
 });
@@ -370,5 +380,19 @@
     background: url('@/assets/images/pictureOnMap/TOjiance.png') no-repeat;
     background-size: 100% 100%;
   }
+
+  .RongYun_icon {
+    margin-top: 23px;
+    margin-right: 20px;
+    cursor: pointer;
+    width: 25px;
+    height: 25px;
+    background: url('@/assets/images/rongYunImg/RongYun_icon.png') no-repeat;
+    background-size: 100% 100%;
+  }
 }
 </style>
+
+<style lang="scss">
+@import '@/assets/styles/pictureOnMap.scss';
+</style>
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index a5fdc51..1c9bb2e 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -2,11 +2,7 @@
   <div class="pictureOnMap">
     <TopTab />
     <div class="mainContentBox">
-      <MapBox
-        :initJson="`/static/libs/mapbox/style/wh_dhgx.json`"
-        :loadCallback="loadCallback"
-        @mapClick1="mapClick1"
-      ></MapBox>
+      <MapBox :initJson="`/static/libs/mapbox/style/wh_dhgx.json`" :loadCallback="loadCallback" @mapClick1="mapClick1"></MapBox>
       <router-view></router-view>
       <recordPage></recordPage>
       <LayerControl></LayerControl>
@@ -39,19 +35,19 @@
   </div>
 </template>
 <script setup>
-import line from "../../../public/static/libs/mapbox/json/line.json";
-import point from "../../../public/static/libs/mapbox/json/point.json";
-import { ref, reactive, onMounted, nextTick } from "vue";
-import TopTab from "./TopTab/index.vue";
-import MapBox from "../../components/Map/MapBox";
-import bus from "@/bus";
-import useUserStore from "@/store/modules/user";
-import DialogTabs from "@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue";
-import { drainageDispatchGetMenu } from "@/api/MonitorAssetsOnMap";
-import recordPage from "@/views/voice/recordPage/index";
-import usepartitionStore from "@/store/modules/partition";
+import line from '../../../public/static/libs/mapbox/json/line.json';
+import point from '../../../public/static/libs/mapbox/json/point.json';
+import { ref, reactive, onMounted, nextTick } from 'vue';
+import TopTab from './TopTab/index.vue';
+import MapBox from '../../components/Map/MapBox';
+import bus from '@/bus';
+import useUserStore from '@/store/modules/user';
+import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
+import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import recordPage from '@/views/voice/recordPage/index';
+import usepartitionStore from '@/store/modules/partition';
 
-import LayerControl from "@/views/pictureOnMap/LayerControl.vue";
+import LayerControl from '@/views/pictureOnMap/LayerControl.vue';
 
 const useStore = usepartitionStore();
 
@@ -63,14 +59,14 @@
 const GetcomIDs = ref([]);
 const dialogConfig = reactive({
   visible: false,
-  dataID: "",
-  dataCode: "",
+  dataID: '',
+  dataCode: '',
   data: {},
   comIDs: [],
   customData: [],
-  RefName: "",
-  title: "详情",
-  typeName: "",
+  RefName: '',
+  title: '详情',
+  typeName: '',
 });
 const closediaMeth = () => {
   dialogConfig.visible = false;
@@ -78,72 +74,68 @@
 // 站点数组
 const arrstcode = ref([
   // 站点类型名称: 编码
-  "outlet_water_level", // 排口流量
-  "outlet_quality", // 排口水质
-  "channel_quality", // 港渠水质
-  "channel_water_level", // 港渠水位
-  "lake_water_level", // 湖泊水位
-  "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
-  "rain", // 雨量站
-  "rainwater_pipeline_quality", // 雨水管网水质
-  "sewage_pipeline_quality", // 污水管网水质
-  "rainwater_pipeline_water_level", // 雨水管网液位
-  "reservoir_water_level", //水库水位
-  "rainPumpStation", //雨水泵站
-  "dirtyPumpStation", //污水泵站
-  "sewageStation", //污水厂
-  "gateStation", //闸门
+  'outlet_water_level', // 排口流量
+  'outlet_quality', // 排口水质
+  'channel_quality', // 港渠水质
+  'channel_water_level', // 港渠水位
+  'lake_water_level', // 湖泊水位
+  'waterlogging', // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
+  'rain', // 雨量站
+  'rainwater_pipeline_quality', // 雨水管网水质
+  'sewage_pipeline_quality', // 污水管网水质
+  'rainwater_pipeline_water_level', // 雨水管网液位
+  'reservoir_water_level', //水库水位
+  'rainPumpStation', //雨水泵站
+  'dirtyPumpStation', //污水泵站
+  'sewageStation', //污水厂
+  'gateStation', //闸门
 ]);
 // 基本数据
 const arrid = ref([
-  "diversion_well_info", // 分流井
-  "drainage_info", // 排水户
-  "lake_info", // 湖泊
-  "outlet_info", // 排口
-  "port_channel_info", // 港渠
-  "rain_water_pump_station_info", // 雨水泵站
-  "region_info", // 分区信息
-  "reservoir_info", // 水库
-  "sewage_factory_info", // 污水处理厂
-  "sewage_factory_station_info", //污水处理站
-  "sewage_pump_station_info", // 污水泵站
-  "storage_tank_info", // 调蓄池
-  "water_gate_info", // 水闸
-  "waterlogging_point_info", // 渍水点
-  "water_region_info", // 水系汇水分区
-  "storehouse", //物资仓库
-  "dikeGood", //堤防备料
+  'diversion_well_info', // 分流井
+  'drainage_info', // 排水户
+  'lake_info', // 湖泊
+  'outlet_info', // 排口
+  'port_channel_info', // 港渠
+  'rain_water_pump_station_info', // 雨水泵站
+  'region_info', // 分区信息
+  'reservoir_info', // 水库
+  'sewage_factory_info', // 污水处理厂
+  'sewage_factory_station_info', //污水处理站
+  'sewage_pump_station_info', // 污水泵站
+  'storage_tank_info', // 调蓄池
+  'water_gate_info', // 水闸
+  'waterlogging_point_info', // 渍水点
+  'water_region_info', // 水系汇水分区
+  'storehouse', //物资仓库
+  'dikeGood', //堤防备料
 ]);
 // 基础数据
 const switchStcode = (Name, type) => {
-  if (type == "outlet_info") {
+  if (type == 'outlet_info') {
     pkClick(Getproperties.value);
   }
-  console.log("GetcomIDs.value", GetcomIDs.value);
+  console.log('GetcomIDs.value', GetcomIDs.value);
 
   if (arrid.value.includes(type)) {
     dialogConfig.visible = true;
     dialogConfig.dataCode = type;
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.dataID = Getproperties.value.pid
-      ? Getproperties.value.pid
-      : Getproperties.value.id;
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.dataID = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs[0] : '';
   } else {
     return;
   }
 };
 // 类型弹框判断
-const typecodeswitch = (type) => {
+const typecodeswitch = type => {
   if (diabox[type]) {
     // console.log('diabox[type]', diabox[type]);
-    window[type + "_map"] = diabox[type]
-      .filter((i) => i.geometry)
+    window[type + '_map'] = diabox[type]
+      .filter(i => i.geometry)
       .map((item, index) => {
-        let coordinates = turf.getCoords(
-          turf.center(Terraformer.WKT.parse(item.geometry))
-        );
+        let coordinates = turf.getCoords(turf.center(Terraformer.WKT.parse(item.geometry)));
         const popup = new mapboxgl1.Popup({
           closeButton: false,
           closeOnClick: false,
@@ -157,7 +149,7 @@
       });
 
     nextTick(() => {
-      window[type + "_map"].forEach((i) => i._setOpacity(0));
+      window[type + '_map'].forEach(i => i._setOpacity(0));
     });
   }
 };
@@ -165,7 +157,7 @@
   let typearr = [];
   for (var k in diabox) {
     typearr.push(k);
-    appStore.MapData.map((item) => {
+    appStore.MapData.map(item => {
       if (item.pointType == k) {
         diabox[k] = item.data;
       }
@@ -186,56 +178,56 @@
     dialogConfig.dataID = Getproperties.value.stCode;
 
     dialogConfig.comIDs = GetcomIDs.value;
-    dialogConfig.title = Getproperties.value.name.split("\n")[0];
-    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : "";
+    dialogConfig.title = Getproperties.value.name.split('\n')[0];
+    dialogConfig.RefName = GetcomIDs.value.length ? GetcomIDs.value[0].menuName : '';
   } else {
     return;
   }
 };
 // 智慧水务大脑一张图 特定大屏动态菜单
-const specificFun = (type) => {
+const specificFun = type => {
   // 监测预警模块弹框
   // value值 统一菜单类型
   //name值 特指智慧水务大脑获取的动态菜单类型
   let arr = [
     {
-      name: "dp_zsfx", //渍水点
-      value: "waterlogging",
+      name: 'dp_zsfx', //渍水点
+      value: 'waterlogging',
     },
     {
-      name: "dp_hhsq", //河湖水情
-      value: "lake_water_level",
+      name: 'dp_hhsq', //河湖水情
+      value: 'lake_water_level',
     },
     {
-      name: "dp_bzgq", //泵站工情
-      value: "rainPumpStation", //雨水泵站
+      name: 'dp_bzgq', //泵站工情
+      value: 'rainPumpStation', //雨水泵站
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_water_level", //雨水管网液位
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_water_level', //雨水管网液位
     },
     {
-      name: "dp_gwfx", //管网风险
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_gwfx', //管网风险
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_wsgwfx", //大屏污水管网风险分析弹框
-      value: "sewage_pipeline_quality", //雨水管网水质
+      name: 'dp_wsgwfx', //大屏污水管网风险分析弹框
+      value: 'sewage_pipeline_quality', //雨水管网水质
     },
     {
-      name: "dp_ysgwfx", //大屏雨水管网风险分析弹框
-      value: "rainwater_pipeline_quality", //雨水管网水质
+      name: 'dp_ysgwfx', //大屏雨水管网风险分析弹框
+      value: 'rainwater_pipeline_quality', //雨水管网水质
     },
   ];
-  return arr.find((item) => item.value == type)?.name || null;
+  return arr.find(item => item.value == type)?.name || null;
 };
 
 // 获取动态弹框菜单
 const GetBoxmenu = (Name, type) => {
-  console.log("name", Name);
-  console.log("type", type);
+  console.log('name', Name);
+  console.log('type', type);
   GetcomIDs.value = [];
-  let dataId = "";
+  let dataId = '';
   if (arrstcode.value.includes(type)) {
     dataId = Getproperties.value.stCode;
   }
@@ -243,21 +235,21 @@
   if (arrid.value.includes(type)) {
     dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
   }
-  console.log("dataId", dataId);
+  console.log('dataId', dataId);
   if (!dataId) {
     // proxy.$modal.msgSuccess('');
     return;
   }
   let params = {
     dataCode: specificFun(type) || type,
-    scene: "basis_monitor",
+    scene: 'basis_monitor',
     dataId: dataId,
   };
-  drainageDispatchGetMenu(params).then((res) => {
-    console.log("获得的菜单", res.data);
+  drainageDispatchGetMenu(params).then(res => {
+    console.log('获得的菜单', res.data);
     Getmenuarr.value = res.data;
     if (res.data && res.data.length) {
-      res.data.map((item) => {
+      res.data.map(item => {
         GetcomIDs.value.push(item.moduleName);
       });
     }
@@ -272,112 +264,104 @@
 const pointandlineOpen = (type, properties) => {
   dialogConfig.visible = true;
   switch (type) {
-    case "pipeline_info_text":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info_text':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_info":
-      dialogConfig.title = "管线信息";
+    case 'pipeline_info':
+      dialogConfig.title = '管线信息';
       break;
-    case "pipeline_point":
-      dialogConfig.title = "管点信息";
+    case 'pipeline_point':
+      dialogConfig.title = '管点信息';
       break;
-    case "point":
-      dialogConfig.title = "问题管线";
+    case 'point':
+      dialogConfig.title = '问题管线';
       break;
   }
 
   Getmenuarr.value = [
     {
-      menuName: "管网信息",
+      menuName: '管网信息',
       show: true,
-      moduleName: "PointAndLine",
+      moduleName: 'PointAndLine',
     },
   ];
 
   // dialogConfig.dataID = '0371000003';
-  dialogConfig.comIDs = ["PointAndLine"];
-  dialogConfig.RefName = "PointAndLine";
+  dialogConfig.comIDs = ['PointAndLine'];
+  dialogConfig.RefName = 'PointAndLine';
 };
 const loadCallback = () => {};
 // 排口溯源
-const pkClick = async (properties) => {
+const pkClick = async properties => {
   // debugger;
   if (!properties.wellCode) return;
   let results = await upStreamAnalyse({ endPointNumber: properties.wellCode });
   let pipelines = results.data.pipelineInfoList
-    .map((i) =>
+    .map(i =>
       turf.feature(Terraformer.WKT.parse(i.geometrys), {
         ...i,
-        area: i.pipelineType == "Rain" ? "雨水" : "污水",
+        area: i.pipelineType == 'Rain' ? '雨水' : '污水',
       })
     )
-    .map((i) =>
-      i.properties.flowDirection == 0
-        ? turf.lineString(turf.getCoords(i).reverse(), i.properties)
-        : i
-    );
+    .map(i => (i.properties.flowDirection == 0 ? turf.lineString(turf.getCoords(i).reverse(), i.properties) : i));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "水系流向")[0]
+    .filter(i => i.newfiberId == '水系流向')[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 };
 
-const a = (properties) => {
-  const keys_ = ["雨水", "污水"];
-  const keys = ["1_泵站", "1_污水处理厂", "分区流向", "分区流向1"];
-  bus.emit("removeMapDatas", keys);
+const a = properties => {
+  const keys_ = ['雨水', '污水'];
+  const keys = ['1_泵站', '1_污水处理厂', '分区流向', '分区流向1'];
+  bus.emit('removeMapDatas', keys);
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection([]));
   const key = properties.c_layer.includes(keys_[0]) ? keys_[0] : keys_[1];
   const nameKey = properties.name.substring(0, 2);
-  let features = line.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.name.includes(nameKey)
-  );
-  let features1 = point.features.filter(
-    (i) => i.properties.area.includes(key) && i.properties.system.includes(nameKey)
-  );
-  let points = _.groupBy(features1, (a) => a.properties.type);
-  features.forEach((i) => {
+  let features = line.features.filter(i => i.properties.area.includes(key) && i.properties.name.includes(nameKey));
+  let features1 = point.features.filter(i => i.properties.area.includes(key) && i.properties.system.includes(nameKey));
+  let points = _.groupBy(features1, a => a.properties.type);
+  features.forEach(i => {
     i.properties.type = keys[2];
-    i.properties.color = key == keys_[0] ? "rgba(21,127,176,1)" : "rgba(255,0,0,1)";
+    i.properties.color = key == keys_[0] ? 'rgba(21,127,176,1)' : 'rgba(255,0,0,1)';
   });
-  Object.keys(points).map((key) =>
-    bus.emit("setGeoJSON", {
+  Object.keys(points).map(key =>
+    bus.emit('setGeoJSON', {
       json: turf.featureCollection(
-        points[key].map((i) => ({
+        points[key].map(i => ({
           type: i.type,
           geometry: i.geometry,
-          properties: { ...i.properties, type: "1_" + key },
+          properties: { ...i.properties, type: '1_' + key },
         }))
       ),
-      key: "1_" + key,
+      key: '1_' + key,
     })
   );
-  bus.emit("setGeoJSON", { json: turf.featureCollection(features), key: keys[2] });
+  bus.emit('setGeoJSON', { json: turf.featureCollection(features), key: keys[2] });
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == keys[3])[0]
+    .filter(i => i.newfiberId == keys[3])[0]
     .getSource()
     .setData(turf.featureCollection(features));
 };
 
 const mapClick1 = (lngLat, properties = {}, layerId) => {
-  console.log("经纬度", lngLat);
-  console.log("数据", properties);
-  console.log("layerid", layerId);
+  console.log('经纬度', lngLat);
+  console.log('数据', properties);
+  console.log('layerid', layerId);
 
   // 处理标注
   Getproperties.value = properties;
-  let type = properties ? properties.type : "" || 1;
-  let Name = properties ? properties.pointTypeName : "" || "";
+  let type = properties ? properties.type : '' || 1;
+  let Name = properties ? properties.pointTypeName : '' || '';
   // Annotation(properties);
-  console.log("1111", type, layerId);
+  console.log('1111', type, layerId);
 
-  if (properties.layer == "排水分区") {
+  if (properties.layer == '排水分区') {
     // a(properties);
 
     // if (Getproperties.value.c_layer.includes('雨水分区_1')) {
@@ -393,24 +377,17 @@
     return;
   }
 
-  let layerIdarr = [
-    "湖泊",
-    "湖泊_text",
-    "港渠",
-    "港渠_text",
-    "水库管理范围",
-    "水库管理范围_text",
-  ];
+  let layerIdarr = ['湖泊', '湖泊_text', '港渠', '港渠_text', '水库管理范围', '水库管理范围_text'];
   let newsetarr = [
-    { name: "湖泊", value: "lake_info" },
-    { name: "湖泊_text", value: "lake_info" },
-    { name: "港渠", value: "port_channel_info" },
-    { name: "港渠_text", value: "port_channel_info" },
-    { name: "水库管理范围", value: "reservoir_info" },
-    { name: "水库管理范围_text", value: "reservoir_info" },
+    { name: '湖泊', value: 'lake_info' },
+    { name: '湖泊_text', value: 'lake_info' },
+    { name: '港渠', value: 'port_channel_info' },
+    { name: '港渠_text', value: 'port_channel_info' },
+    { name: '水库管理范围', value: 'reservoir_info' },
+    { name: '水库管理范围_text', value: 'reservoir_info' },
   ];
   if (layerIdarr.includes(layerId)) {
-    type = newsetarr.find((item) => {
+    type = newsetarr.find(item => {
       return layerId == item.name;
     }).value;
 
@@ -419,15 +396,15 @@
     return;
   }
 
-  let arr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
+  let arr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
 
   if (arr.includes(layerId)) {
-    console.log("进了方法");
+    console.log('进了方法');
     pointandlineOpen(layerId);
     dialogConfig.dataCode = layerId;
-  } else if (properties.type && properties.type == "问题管线") {
-    pointandlineOpen("point");
-    dialogConfig.dataCode = "point";
+  } else if (properties.type && properties.type == '问题管线') {
+    pointandlineOpen('point');
+    dialogConfig.dataCode = 'point';
   } else {
     if (type) {
       GetBoxmenu(Name, type);
@@ -437,30 +414,27 @@
 
 // 根据类型处理接口返回的标注内容
 const AnnotationArr = ref([]);
-const StringName = ref("");
-const Annotation = (properties) => {
+const StringName = ref('');
+const Annotation = properties => {
   if (properties.siteData && properties.siteData.length) {
     let arr = JSON.parse(properties.siteData);
     AnnotationArr.value = arr;
-    console.log("数据", arr);
-    let string = "";
+    console.log('数据', arr);
+    let string = '';
 
     switch (properties.type) {
-      case "rain":
-        AnnotationArr.value = [
-          { valueName: "监测时间", value: properties.recordTime },
-          ...arr,
-        ];
+      case 'rain':
+        AnnotationArr.value = [{ valueName: '监测时间', value: properties.recordTime }, ...arr];
         break;
     }
     string = Methtion(string);
-    console.log("数据", string);
+    console.log('数据', string);
   }
 };
 
-const Methtion = (StringName) => {
+const Methtion = StringName => {
   if (AnnotationArr.value.length) {
-    AnnotationArr.value.map((item) => {
+    AnnotationArr.value.map(item => {
       StringName += `${item.valueName}:${item.value}+'/n' `;
     });
     return StringName;
@@ -477,7 +451,7 @@
     domElement.webkitRequestFullScreen();
   }
 };
-const closeFun = (is) => {
+const closeFun = is => {
   dialogConfig.visible = is;
 };
 function anotherMeht(item) {
@@ -486,12 +460,12 @@
   Getproperties.value.dataCode = item.dataCode;
   Getproperties.value.wellcode = item.wellCode || item.dataName;
   Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
-  Getproperties.value.dataId = item.dataId || "";
+  Getproperties.value.dataId = item.dataId || '';
   Getproperties.value.stType = item.stType;
   Getproperties.value.geometry = item.geometry;
   Getproperties.value.waterRegionCode = item.waterRegionCode; //河湖水情  查询水系分区详情
 
-  console.log("Getproperties", Getproperties.value);
+  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
@@ -499,15 +473,15 @@
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
-  GetBoxmenu("", item.stType);
+  GetBoxmenu('', item.stType);
 }
 
 onMounted(() => {
   allScreen();
   useStore.getsewageData();
-  bus.on("DynamicBus", (item) => {
-    console.log("item", item);
-    dialogConfig.RefName = item.RefName || "";
+  bus.on('DynamicBus', item => {
+    console.log('item', item);
+    dialogConfig.RefName = item.RefName || '';
     dialogConfig.title = item.stName || item.name;
     if (!!!item.NoPromise) {
       anotherMeht(item);
@@ -517,31 +491,31 @@
       dialogConfig.visible = true;
       dialogConfig.dataCode = item.type;
       Getmenuarr.value = item.Getmenuarr;
-      dialogConfig.comIDs = ["zhoubianjiejing", "szycfxJCFX"];
-      dialogConfig.title = item.name.split("\n")[0];
+      dialogConfig.comIDs = item.comIDs;
+      dialogConfig.title = item.name.split('\n')[0];
       dialogConfig.dataID = item.pid ? item.pid : item.id;
     }
   });
-  bus.on("closedia", (e) => {
+  bus.on('closedia', e => {
     closediaMeth();
   });
-  bus.on("changeData", (e) => {
+  bus.on('changeData', e => {
     // switchArr();
   });
 });
 
 onBeforeUnmount(() => {
-  bus.off("DynamicBus");
-  bus.off("closedia");
-  bus.off("changeData");
+  bus.off('DynamicBus');
+  bus.off('closedia');
+  bus.off('changeData');
 });
 </script>
 <style lang="scss">
-@import "@/assets/styles/pictureOnMap.scss";
+@import '@/assets/styles/pictureOnMap.scss';
 .pictureOnMap {
   width: 100%;
   height: 100%;
-  background: url("@/assets/images/pictureOnMap/maxBgc.png") no-repeat center;
+  background: url('@/assets/images/pictureOnMap/maxBgc.png') no-repeat center;
   background-size: 100% 100%;
   color: #fff;
   overflow: hidden;
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
index 153d2b0..620a129 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/index.vue
@@ -241,9 +241,9 @@
             v-if="dialogConfig.activeName == 'ydfx'"
           ></Ydfx>
         </el-tab-pane>
-        <!-- <el-tab-pane label="测试1" name="yszrfxJCFX">
-          <yszrfxJCFX v-if="dialogConfig.activeName == 'yszrfxJCFX'"></yszrfxJCFX>
-        </el-tab-pane> -->
+        <el-tab-pane label="测试_分析弹窗" name="szycfxJCFX">
+          <szycfxJCFX v-if="dialogConfig.activeName == 'szycfxJCFX'"></szycfxJCFX>
+        </el-tab-pane>
       </el-tabs>
     </el-dialog>
   </div>
@@ -269,15 +269,13 @@
 import Dxssr from "./tab_components/dxssr.vue";
 
 // 测试
-// import yszrfxJCFX from "./../components/DialogTabs/component/yszrfxJCFX.vue";
+import szycfxJCFX from "./../components/DialogTabs/component/szycfxJCFX.vue";
 // 面板控制组件
 import PanelDisplayHidden from "@/views/pictureOnMap/page/components/PanelDisplayHidden.vue";
 const showPanel = ref(false); //面板展开收起
 const PanelChange = (val) => {
   showPanel.value = val;
 };
-// 全景弹窗
-import StreetSpace from "@/components/Map/streetSpace";
 
 const dialogConfig = reactive({
   visible: false,
@@ -487,8 +485,10 @@
 const TypeClick = (item) => {
   let type = item.key;
   bus.emit("clearTemporaryData");
-  AllData.yw_type.forEach((i) => i.value.split(',').forEach(o => operationLayer(o, false)));
-  item.value.split(',').forEach(o => operationLayer(o, true));
+  AllData.yw_type.forEach((i) =>
+    i.value.split(",").forEach((o) => operationLayer(o, false))
+  );
+  item.value.split(",").forEach((o) => operationLayer(o, true));
   AllData.regionGrade = "one";
   AllData.regionName = "";
   newfiberMap.map.easeTo(newfiberMap.config_.params.init);
@@ -1166,7 +1166,9 @@
 
 onBeforeUnmount(() => {
   const { setHighlight } = events_params;
-  AllData.yw_type.forEach((i) => i.value.split(',').forEach(o => operationLayer(o, false)));
+  AllData.yw_type.forEach((i) =>
+    i.value.split(",").forEach((o) => operationLayer(o, false))
+  );
   bus.emit(setHighlight.key, []);
   bus.off("FenQuClick");
   bus.off("openJXFXDialog");
diff --git a/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue b/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue
index a758fc9..718627a 100644
--- a/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue
+++ b/src/views/pictureOnMap/page/WaterAssets/shuziluanshengBottom/index.vue
@@ -246,17 +246,23 @@
     height: 30px;
     line-height: 30px;
     text-align: center;
-    background: linear-gradient(0deg, rgba(37, 61, 101, 0.8) 0%, rgba(37, 61, 101, 0.1) 100%);
-    border-radius: 15px;
-    border: 1px solid #8196b9;
-    color: #8fbffe;
     margin-left: 10px;
-    font-size: 12px;
+    background: linear-gradient(180deg, #0c2156 0%, #2291e1 100%);
+    border-radius: 15px;
+    border: 1px solid #2291e1;
+    // border-image: linear-gradient(0deg, #308fee, #2abffa, #308fee) 10 10;
+    font-family: Source Han Sans CN;
+    font-weight: bold;
+    font-size: 14px;
+    color: #e0e5fa;
 
     &.active {
-      background: linear-gradient(0deg, rgba(81, 136, 176, 0.8) 0%, rgba(126, 214, 255, 0.1) 100%);
+      background: linear-gradient(0deg, #0c3f57 0%, #1dd0c7 100%);
       border-radius: 15px;
-      border: 1px solid #7ed6ff;
+      border: 1px solid #27f1c6;
+      font-family: Source Han Sans CN;
+      font-weight: bold;
+      font-size: 14px;
       color: #ffffff;
     }
   }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index 6ed6ee8..e52f4ed 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -29,6 +29,7 @@
 import { ref, reactive, toRefs, onMounted, nextTick } from "vue";
 import * as echarts from "echarts";
 import { getEchart } from "@/api/MonitorAssetsOnMap";
+import { riskAnalysisReason } from "@/api/MonitoringAnalysis";
 const props = defineProps({
   // 数据id
   dataID: {
@@ -355,22 +356,36 @@
   }
 };
 const getChartsData = () => {
-  console.log(props);
   getEchart({
-    stType: props.Getproperties.stType,
-    stCode: props.Getproperties.stCode,
-    dataCode: props.Getproperties.dataCode,
-    start: "2024-07-01 00:00:00",
-    end: "2024-07-01 23:59:59",
+    // stType: props.Getproperties.stType,
+    // stCode: props.Getproperties.stCode,
+    // dataCode: props.Getproperties.dataCode,
+    // start: "2024-07-01 00:00:00",
+    // end: "2024-07-01 23:59:59",
+    stType: "rainwater_pipeline_quality",
+    stCode: "0201460323",
+    dataCode: "pipePoint",
+    start: "2024-11-26 11:10:03",
+    end: "2024-11-27 11:10:03",
   }).then((res) => {
     if (res && res.code == 200) {
       init();
     }
   });
 };
+const getFenXiData = () => {
+  console.log(props);
+  riskAnalysisReason({
+    startTime: "2024-07-01 00:00:00",
+    endTime: "2024-07-01 23:59:59",
+    stCode: "",
+    menuType: "",
+  }).then((res) => {});
+};
 onMounted(() => {
   nextTick(() => {
     getChartsData();
+    getFenXiData();
     window.addEventListener("resize", resizeTheChart);
   });
 });
diff --git a/src/views/voice/recordPage/index.vue b/src/views/voice/recordPage/index.vue
index 1109120..c51e078 100644
--- a/src/views/voice/recordPage/index.vue
+++ b/src/views/voice/recordPage/index.vue
@@ -327,7 +327,7 @@
   position: fixed;
   z-index: 100;
   top: 13px;
-  right: 75px;
+  right: 110px;
   animation: hideLeftMenu 0.75s ease-in-out;
   animation-fill-mode: forwards;