diff --git a/src/views/RongyunCommunication/RongYunBox/index.vue b/src/views/RongyunCommunication/RongYunBox/index.vue
index 963855e..6571b3e 100644
--- a/src/views/RongyunCommunication/RongYunBox/index.vue
+++ b/src/views/RongyunCommunication/RongYunBox/index.vue
@@ -68,12 +68,7 @@
               :popper-append-to-body="true"
               popper-class="eloption"
             >
-              <el-option
-                v-for="dict in inviteuserIdsList"
-                :key="dict.registerThridUserId"
-                :label="dict.name + '(' + dict.registerPlatform + ')'"
-                :value="dict.registerThridUserId"
-              ></el-option>
+              <el-option v-for="dict in inviteuserIdsList" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
             </el-select>
           </div>
         </div>
@@ -111,6 +106,8 @@
 } from '@/views/RongyunCommunication/rongyunjs/rongyunApi.js';
 import { findCurrentTreeObj } from '@/utils/ruoyi';
 
+import { RCCallErrorCode } from '@rongcloud/plugin-call';
+
 const appStore = useUserStore();
 const useRongyunStore = rongyunStore();
 const { proxy } = getCurrentInstance();
@@ -409,24 +406,48 @@
       GetallOnline();
     } else {
       const reason = code === RCCallErrorCode.NOT_IN_GROUP ? '当前用户未加入群组' : code;
-      proxy.$modal.msgWarning(`呼叫失败，错误原因：${reason}`);
+      proxy.$modal.msgWarning(`呼叫失败，错误原因：${code}`);
       removeVideoEl();
     }
   });
 };
+let endids = ref([]);
 
 // 邀请用户加入当前通话（仅限群组）
 const inviteCall = () => {
   if (Getidinvite.value && Getidinvite.value.length) {
+    console.log('点击了邀请', Getidinvite.value, inviteuserIdsList.value);
+    let ids = [];
+    let GetuserList = [];
+    Getidinvite.value.map(item => {
+      inviteuserIdsList.value.map(p => {
+        if (item == p.id) {
+          GetuserList.push(p);
+        }
+      });
+    });
+    console.log('点击了邀请', GetuserList);
+
+    GetuserList.map(item => {
+      item.userTokenList.length &&
+        item.userTokenList.map(p => {
+          if (p.isOnlion) {
+            ids.push(p.registerThridUserId);
+          }
+        });
+    });
+
+    endids.value = ids;
+
     let params = {
       groupId: props.ryUser.groupId,
-      ids: Getidinvite.value.join(','),
+      ids: ids.join(','),
     };
     groupJoinUsers(params).then(res => {
       console.log(res);
 
-      console.log('点击了邀请', Getidinvite.value);
-      useRongyunStore.callSession.invite(Getidinvite.value).then(({ code }) => {
+      console.log('点击了邀请', ids);
+      useRongyunStore.callSession.invite(ids).then(({ code }) => {
         console.log(code);
         if (code === 10000) {
           proxy.$modal.msgSuccess(`邀请成功`);
@@ -489,23 +510,20 @@
 // 获取所有注册用户
 const GetallOnline = item => {
   inviteuserIdsList.value = [];
+  console.log('被邀请人', props.ryUser);
+  // let havaUser = [];
 
-  // let params = {
-  //   isOnlion: 1,
-  // };
+  // props.ryUser.userIds.map(item => {
+  //   havaUser.push(item.split('_')[0]);
+  // });
+
+  // console.log('被邀请人', havaUser);
+
   listrcloudUnitUser().then(res => {
     res.data.map(item => {
-      item.userTokenList.map(p => {
-        p.name = item.name;
-        // 过滤数据 保留当前在线并且不在已呼叫名单上的人
-        if (!props.ryUser.userIds.includes(p.registerThridUserId)) {
-          if (p.isOnlion == 1 && p.registerPlatform == 'web') {
-            inviteuserIdsList.value.push(p);
-          } else if (p.registerPlatform == 'app') {
-            inviteuserIdsList.value.push(p);
-          }
-        }
-      });
+      if (item.isOnlion && !props.ryUser.userIds.includes(item.phone)) {
+        inviteuserIdsList.value.push(item);
+      }
     });
     console.log('被邀请人', inviteuserIdsList.value, props.ryUser.userIds);
   });
@@ -538,8 +556,8 @@
     node.innerHTML = videoTpl;
     node.classList.add('video-item');
 
-    let length = allData.userList.length;
-    console.log('什么东西', allData.userId, uid, props.callType, length);
+    let length = allData.userList.length + endids.value.length;
+    console.log('什么东西xxxxx', allData.userId, uid, props.callType, length);
 
     // 根据人数判断渲染不同的视图样式
     if (allData.userId + '_web' == uid && length <= 2) {
@@ -562,6 +580,20 @@
       const videoEl = document.getElementById(`${track.getUserId()}`);
       track.play(videoEl);
     }
+    const targetElements = document.querySelectorAll('.video-item');
+    console.log('targetElements', targetElements);
+
+    targetElements.forEach(target => {
+      target.classList.remove('video-item-4');
+      target.classList.remove('video-item-8');
+
+      if (length > 2 && length <= 4) {
+        target.classList.add('video-item-4');
+      }
+      if (length > 4 && length <= 8) {
+        target.classList.add('video-item-8');
+      }
+    });
   }
 };
 

diff --git a/src/views/RongyunCommunication/RongYunBox/index.vue b/src/views/RongyunCommunication/RongYunBox/index.vue
index 963855e..6571b3e 100644
--- a/src/views/RongyunCommunication/RongYunBox/index.vue
+++ b/src/views/RongyunCommunication/RongYunBox/index.vue
@@ -68,12 +68,7 @@
               :popper-append-to-body="true"
               popper-class="eloption"
             >
-              <el-option
-                v-for="dict in inviteuserIdsList"
-                :key="dict.registerThridUserId"
-                :label="dict.name + '(' + dict.registerPlatform + ')'"
-                :value="dict.registerThridUserId"
-              ></el-option>
+              <el-option v-for="dict in inviteuserIdsList" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
             </el-select>
           </div>
         </div>
@@ -111,6 +106,8 @@
 } from '@/views/RongyunCommunication/rongyunjs/rongyunApi.js';
 import { findCurrentTreeObj } from '@/utils/ruoyi';
 
+import { RCCallErrorCode } from '@rongcloud/plugin-call';
+
 const appStore = useUserStore();
 const useRongyunStore = rongyunStore();
 const { proxy } = getCurrentInstance();
@@ -409,24 +406,48 @@
       GetallOnline();
     } else {
       const reason = code === RCCallErrorCode.NOT_IN_GROUP ? '当前用户未加入群组' : code;
-      proxy.$modal.msgWarning(`呼叫失败，错误原因：${reason}`);
+      proxy.$modal.msgWarning(`呼叫失败，错误原因：${code}`);
       removeVideoEl();
     }
   });
 };
+let endids = ref([]);
 
 // 邀请用户加入当前通话（仅限群组）
 const inviteCall = () => {
   if (Getidinvite.value && Getidinvite.value.length) {
+    console.log('点击了邀请', Getidinvite.value, inviteuserIdsList.value);
+    let ids = [];
+    let GetuserList = [];
+    Getidinvite.value.map(item => {
+      inviteuserIdsList.value.map(p => {
+        if (item == p.id) {
+          GetuserList.push(p);
+        }
+      });
+    });
+    console.log('点击了邀请', GetuserList);
+
+    GetuserList.map(item => {
+      item.userTokenList.length &&
+        item.userTokenList.map(p => {
+          if (p.isOnlion) {
+            ids.push(p.registerThridUserId);
+          }
+        });
+    });
+
+    endids.value = ids;
+
     let params = {
       groupId: props.ryUser.groupId,
-      ids: Getidinvite.value.join(','),
+      ids: ids.join(','),
     };
     groupJoinUsers(params).then(res => {
       console.log(res);
 
-      console.log('点击了邀请', Getidinvite.value);
-      useRongyunStore.callSession.invite(Getidinvite.value).then(({ code }) => {
+      console.log('点击了邀请', ids);
+      useRongyunStore.callSession.invite(ids).then(({ code }) => {
         console.log(code);
         if (code === 10000) {
           proxy.$modal.msgSuccess(`邀请成功`);
@@ -489,23 +510,20 @@
 // 获取所有注册用户
 const GetallOnline = item => {
   inviteuserIdsList.value = [];
+  console.log('被邀请人', props.ryUser);
+  // let havaUser = [];
 
-  // let params = {
-  //   isOnlion: 1,
-  // };
+  // props.ryUser.userIds.map(item => {
+  //   havaUser.push(item.split('_')[0]);
+  // });
+
+  // console.log('被邀请人', havaUser);
+
   listrcloudUnitUser().then(res => {
     res.data.map(item => {
-      item.userTokenList.map(p => {
-        p.name = item.name;
-        // 过滤数据 保留当前在线并且不在已呼叫名单上的人
-        if (!props.ryUser.userIds.includes(p.registerThridUserId)) {
-          if (p.isOnlion == 1 && p.registerPlatform == 'web') {
-            inviteuserIdsList.value.push(p);
-          } else if (p.registerPlatform == 'app') {
-            inviteuserIdsList.value.push(p);
-          }
-        }
-      });
+      if (item.isOnlion && !props.ryUser.userIds.includes(item.phone)) {
+        inviteuserIdsList.value.push(item);
+      }
     });
     console.log('被邀请人', inviteuserIdsList.value, props.ryUser.userIds);
   });
@@ -538,8 +556,8 @@
     node.innerHTML = videoTpl;
     node.classList.add('video-item');
 
-    let length = allData.userList.length;
-    console.log('什么东西', allData.userId, uid, props.callType, length);
+    let length = allData.userList.length + endids.value.length;
+    console.log('什么东西xxxxx', allData.userId, uid, props.callType, length);
 
     // 根据人数判断渲染不同的视图样式
     if (allData.userId + '_web' == uid && length <= 2) {
@@ -562,6 +580,20 @@
       const videoEl = document.getElementById(`${track.getUserId()}`);
       track.play(videoEl);
     }
+    const targetElements = document.querySelectorAll('.video-item');
+    console.log('targetElements', targetElements);
+
+    targetElements.forEach(target => {
+      target.classList.remove('video-item-4');
+      target.classList.remove('video-item-8');
+
+      if (length > 2 && length <= 4) {
+        target.classList.add('video-item-4');
+      }
+      if (length > 4 && length <= 8) {
+        target.classList.add('video-item-8');
+      }
+    });
   }
 };
 
diff --git a/src/views/RongyunCommunication/index.vue b/src/views/RongyunCommunication/index.vue
index 310fb39..6debc56 100644
--- a/src/views/RongyunCommunication/index.vue
+++ b/src/views/RongyunCommunication/index.vue
@@ -498,6 +498,21 @@
       let videoEl = document.getElementById(uid);
       track.play(videoEl);
     }
+
+    const targetElements = document.querySelectorAll('.video-item');
+    console.log('targetElements', targetElements);
+
+    targetElements.forEach(target => {
+      target.classList.remove('video-item-4');
+      target.classList.remove('video-item-8');
+
+      if (length > 2 && length <= 4) {
+        target.classList.add('video-item-4');
+      }
+      if (length > 4 && length <= 8) {
+        target.classList.add('video-item-8');
+      }
+    });
   }
 };
 //关闭视频弹窗

diff --git a/src/views/RongyunCommunication/RongYunBox/index.vue b/src/views/RongyunCommunication/RongYunBox/index.vue
index 963855e..6571b3e 100644
--- a/src/views/RongyunCommunication/RongYunBox/index.vue
+++ b/src/views/RongyunCommunication/RongYunBox/index.vue
@@ -68,12 +68,7 @@
               :popper-append-to-body="true"
               popper-class="eloption"
             >
-              <el-option
-                v-for="dict in inviteuserIdsList"
-                :key="dict.registerThridUserId"
-                :label="dict.name + '(' + dict.registerPlatform + ')'"
-                :value="dict.registerThridUserId"
-              ></el-option>
+              <el-option v-for="dict in inviteuserIdsList" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
             </el-select>
           </div>
         </div>
@@ -111,6 +106,8 @@
 } from '@/views/RongyunCommunication/rongyunjs/rongyunApi.js';
 import { findCurrentTreeObj } from '@/utils/ruoyi';
 
+import { RCCallErrorCode } from '@rongcloud/plugin-call';
+
 const appStore = useUserStore();
 const useRongyunStore = rongyunStore();
 const { proxy } = getCurrentInstance();
@@ -409,24 +406,48 @@
       GetallOnline();
     } else {
       const reason = code === RCCallErrorCode.NOT_IN_GROUP ? '当前用户未加入群组' : code;
-      proxy.$modal.msgWarning(`呼叫失败，错误原因：${reason}`);
+      proxy.$modal.msgWarning(`呼叫失败，错误原因：${code}`);
       removeVideoEl();
     }
   });
 };
+let endids = ref([]);
 
 // 邀请用户加入当前通话（仅限群组）
 const inviteCall = () => {
   if (Getidinvite.value && Getidinvite.value.length) {
+    console.log('点击了邀请', Getidinvite.value, inviteuserIdsList.value);
+    let ids = [];
+    let GetuserList = [];
+    Getidinvite.value.map(item => {
+      inviteuserIdsList.value.map(p => {
+        if (item == p.id) {
+          GetuserList.push(p);
+        }
+      });
+    });
+    console.log('点击了邀请', GetuserList);
+
+    GetuserList.map(item => {
+      item.userTokenList.length &&
+        item.userTokenList.map(p => {
+          if (p.isOnlion) {
+            ids.push(p.registerThridUserId);
+          }
+        });
+    });
+
+    endids.value = ids;
+
     let params = {
       groupId: props.ryUser.groupId,
-      ids: Getidinvite.value.join(','),
+      ids: ids.join(','),
     };
     groupJoinUsers(params).then(res => {
       console.log(res);
 
-      console.log('点击了邀请', Getidinvite.value);
-      useRongyunStore.callSession.invite(Getidinvite.value).then(({ code }) => {
+      console.log('点击了邀请', ids);
+      useRongyunStore.callSession.invite(ids).then(({ code }) => {
         console.log(code);
         if (code === 10000) {
           proxy.$modal.msgSuccess(`邀请成功`);
@@ -489,23 +510,20 @@
 // 获取所有注册用户
 const GetallOnline = item => {
   inviteuserIdsList.value = [];
+  console.log('被邀请人', props.ryUser);
+  // let havaUser = [];
 
-  // let params = {
-  //   isOnlion: 1,
-  // };
+  // props.ryUser.userIds.map(item => {
+  //   havaUser.push(item.split('_')[0]);
+  // });
+
+  // console.log('被邀请人', havaUser);
+
   listrcloudUnitUser().then(res => {
     res.data.map(item => {
-      item.userTokenList.map(p => {
-        p.name = item.name;
-        // 过滤数据 保留当前在线并且不在已呼叫名单上的人
-        if (!props.ryUser.userIds.includes(p.registerThridUserId)) {
-          if (p.isOnlion == 1 && p.registerPlatform == 'web') {
-            inviteuserIdsList.value.push(p);
-          } else if (p.registerPlatform == 'app') {
-            inviteuserIdsList.value.push(p);
-          }
-        }
-      });
+      if (item.isOnlion && !props.ryUser.userIds.includes(item.phone)) {
+        inviteuserIdsList.value.push(item);
+      }
     });
     console.log('被邀请人', inviteuserIdsList.value, props.ryUser.userIds);
   });
@@ -538,8 +556,8 @@
     node.innerHTML = videoTpl;
     node.classList.add('video-item');
 
-    let length = allData.userList.length;
-    console.log('什么东西', allData.userId, uid, props.callType, length);
+    let length = allData.userList.length + endids.value.length;
+    console.log('什么东西xxxxx', allData.userId, uid, props.callType, length);
 
     // 根据人数判断渲染不同的视图样式
     if (allData.userId + '_web' == uid && length <= 2) {
@@ -562,6 +580,20 @@
       const videoEl = document.getElementById(`${track.getUserId()}`);
       track.play(videoEl);
     }
+    const targetElements = document.querySelectorAll('.video-item');
+    console.log('targetElements', targetElements);
+
+    targetElements.forEach(target => {
+      target.classList.remove('video-item-4');
+      target.classList.remove('video-item-8');
+
+      if (length > 2 && length <= 4) {
+        target.classList.add('video-item-4');
+      }
+      if (length > 4 && length <= 8) {
+        target.classList.add('video-item-8');
+      }
+    });
   }
 };
 
diff --git a/src/views/RongyunCommunication/index.vue b/src/views/RongyunCommunication/index.vue
index 310fb39..6debc56 100644
--- a/src/views/RongyunCommunication/index.vue
+++ b/src/views/RongyunCommunication/index.vue
@@ -498,6 +498,21 @@
       let videoEl = document.getElementById(uid);
       track.play(videoEl);
     }
+
+    const targetElements = document.querySelectorAll('.video-item');
+    console.log('targetElements', targetElements);
+
+    targetElements.forEach(target => {
+      target.classList.remove('video-item-4');
+      target.classList.remove('video-item-8');
+
+      if (length > 2 && length <= 4) {
+        target.classList.add('video-item-4');
+      }
+      if (length > 4 && length <= 8) {
+        target.classList.add('video-item-8');
+      }
+    });
   }
 };
 //关闭视频弹窗
diff --git a/src/views/RongyunCommunication/rongyuncss/index.scss b/src/views/RongyunCommunication/rongyuncss/index.scss
index ddf64d7..20c3ed8 100644
--- a/src/views/RongyunCommunication/rongyuncss/index.scss
+++ b/src/views/RongyunCommunication/rongyuncss/index.scss
@@ -323,7 +323,7 @@
           li {
             color: #fff;
             &.is-active {
-              color: #eee;
+              color: #409eff;
             }
           }
         }

diff --git a/src/views/RongyunCommunication/RongYunBox/index.vue b/src/views/RongyunCommunication/RongYunBox/index.vue
index 963855e..6571b3e 100644
--- a/src/views/RongyunCommunication/RongYunBox/index.vue
+++ b/src/views/RongyunCommunication/RongYunBox/index.vue
@@ -68,12 +68,7 @@
               :popper-append-to-body="true"
               popper-class="eloption"
             >
-              <el-option
-                v-for="dict in inviteuserIdsList"
-                :key="dict.registerThridUserId"
-                :label="dict.name + '(' + dict.registerPlatform + ')'"
-                :value="dict.registerThridUserId"
-              ></el-option>
+              <el-option v-for="dict in inviteuserIdsList" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
             </el-select>
           </div>
         </div>
@@ -111,6 +106,8 @@
 } from '@/views/RongyunCommunication/rongyunjs/rongyunApi.js';
 import { findCurrentTreeObj } from '@/utils/ruoyi';
 
+import { RCCallErrorCode } from '@rongcloud/plugin-call';
+
 const appStore = useUserStore();
 const useRongyunStore = rongyunStore();
 const { proxy } = getCurrentInstance();
@@ -409,24 +406,48 @@
       GetallOnline();
     } else {
       const reason = code === RCCallErrorCode.NOT_IN_GROUP ? '当前用户未加入群组' : code;
-      proxy.$modal.msgWarning(`呼叫失败，错误原因：${reason}`);
+      proxy.$modal.msgWarning(`呼叫失败，错误原因：${code}`);
       removeVideoEl();
     }
   });
 };
+let endids = ref([]);
 
 // 邀请用户加入当前通话（仅限群组）
 const inviteCall = () => {
   if (Getidinvite.value && Getidinvite.value.length) {
+    console.log('点击了邀请', Getidinvite.value, inviteuserIdsList.value);
+    let ids = [];
+    let GetuserList = [];
+    Getidinvite.value.map(item => {
+      inviteuserIdsList.value.map(p => {
+        if (item == p.id) {
+          GetuserList.push(p);
+        }
+      });
+    });
+    console.log('点击了邀请', GetuserList);
+
+    GetuserList.map(item => {
+      item.userTokenList.length &&
+        item.userTokenList.map(p => {
+          if (p.isOnlion) {
+            ids.push(p.registerThridUserId);
+          }
+        });
+    });
+
+    endids.value = ids;
+
     let params = {
       groupId: props.ryUser.groupId,
-      ids: Getidinvite.value.join(','),
+      ids: ids.join(','),
     };
     groupJoinUsers(params).then(res => {
       console.log(res);
 
-      console.log('点击了邀请', Getidinvite.value);
-      useRongyunStore.callSession.invite(Getidinvite.value).then(({ code }) => {
+      console.log('点击了邀请', ids);
+      useRongyunStore.callSession.invite(ids).then(({ code }) => {
         console.log(code);
         if (code === 10000) {
           proxy.$modal.msgSuccess(`邀请成功`);
@@ -489,23 +510,20 @@
 // 获取所有注册用户
 const GetallOnline = item => {
   inviteuserIdsList.value = [];
+  console.log('被邀请人', props.ryUser);
+  // let havaUser = [];
 
-  // let params = {
-  //   isOnlion: 1,
-  // };
+  // props.ryUser.userIds.map(item => {
+  //   havaUser.push(item.split('_')[0]);
+  // });
+
+  // console.log('被邀请人', havaUser);
+
   listrcloudUnitUser().then(res => {
     res.data.map(item => {
-      item.userTokenList.map(p => {
-        p.name = item.name;
-        // 过滤数据 保留当前在线并且不在已呼叫名单上的人
-        if (!props.ryUser.userIds.includes(p.registerThridUserId)) {
-          if (p.isOnlion == 1 && p.registerPlatform == 'web') {
-            inviteuserIdsList.value.push(p);
-          } else if (p.registerPlatform == 'app') {
-            inviteuserIdsList.value.push(p);
-          }
-        }
-      });
+      if (item.isOnlion && !props.ryUser.userIds.includes(item.phone)) {
+        inviteuserIdsList.value.push(item);
+      }
     });
     console.log('被邀请人', inviteuserIdsList.value, props.ryUser.userIds);
   });
@@ -538,8 +556,8 @@
     node.innerHTML = videoTpl;
     node.classList.add('video-item');
 
-    let length = allData.userList.length;
-    console.log('什么东西', allData.userId, uid, props.callType, length);
+    let length = allData.userList.length + endids.value.length;
+    console.log('什么东西xxxxx', allData.userId, uid, props.callType, length);
 
     // 根据人数判断渲染不同的视图样式
     if (allData.userId + '_web' == uid && length <= 2) {
@@ -562,6 +580,20 @@
       const videoEl = document.getElementById(`${track.getUserId()}`);
       track.play(videoEl);
     }
+    const targetElements = document.querySelectorAll('.video-item');
+    console.log('targetElements', targetElements);
+
+    targetElements.forEach(target => {
+      target.classList.remove('video-item-4');
+      target.classList.remove('video-item-8');
+
+      if (length > 2 && length <= 4) {
+        target.classList.add('video-item-4');
+      }
+      if (length > 4 && length <= 8) {
+        target.classList.add('video-item-8');
+      }
+    });
   }
 };
 
diff --git a/src/views/RongyunCommunication/index.vue b/src/views/RongyunCommunication/index.vue
index 310fb39..6debc56 100644
--- a/src/views/RongyunCommunication/index.vue
+++ b/src/views/RongyunCommunication/index.vue
@@ -498,6 +498,21 @@
       let videoEl = document.getElementById(uid);
       track.play(videoEl);
     }
+
+    const targetElements = document.querySelectorAll('.video-item');
+    console.log('targetElements', targetElements);
+
+    targetElements.forEach(target => {
+      target.classList.remove('video-item-4');
+      target.classList.remove('video-item-8');
+
+      if (length > 2 && length <= 4) {
+        target.classList.add('video-item-4');
+      }
+      if (length > 4 && length <= 8) {
+        target.classList.add('video-item-8');
+      }
+    });
   }
 };
 //关闭视频弹窗
diff --git a/src/views/RongyunCommunication/rongyuncss/index.scss b/src/views/RongyunCommunication/rongyuncss/index.scss
index ddf64d7..20c3ed8 100644
--- a/src/views/RongyunCommunication/rongyuncss/index.scss
+++ b/src/views/RongyunCommunication/rongyuncss/index.scss
@@ -323,7 +323,7 @@
           li {
             color: #fff;
             &.is-active {
-              color: #eee;
+              color: #409eff;
             }
           }
         }
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue
index 73b70bb..1bf499e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Hhsq.vue
@@ -28,11 +28,7 @@
       </div>
     </div>
     <!-- 表格 -->
-    <div
-      class="writeTable"
-      v-loading="loading"
-      element-loading-background="rgba(11, 18, 52, 0.3)"
-    >
+    <div class="writeTable" v-loading="loading" element-loading-background="rgba(11, 18, 52, 0.3)">
       <div class="thBox">
         <span>名称</span>
         <span>当前水位</span>
@@ -50,7 +46,7 @@
           <div class="stree" :title="item.name">
             {{ item.name }}
           </div>
-          <div>{{ item.z || "--" }}</div>
+          <div>{{ item.z == 0 ? '--' : item.z }}</div>
           <div>{{ item.mormalWaterLevel }}</div>
           <div class="btnOperation">
             <span class="colorRed" v-if="item.warnInfoCode == 3">超控制</span>
@@ -65,7 +61,7 @@
       <div class="hupoText" :title="activeObj.description">
         {{ activeObj.description }}
       </div>
-      <div class="hupoImg ">
+      <div class="hupoImg">
         <el-image
           v-if="activeObj.imgArr?.length > 0"
           style="width: 100%; height: 100%"
@@ -83,9 +79,9 @@
   </div>
 </template>
 <script setup name="Hhsq">
-import { ref, reactive, onMounted } from "vue";
-import { drainageDispatchMonitorData } from "@/api/FloodControlAndDrainage.js";
-import bus from "@/bus";
+import { ref, reactive, onMounted } from 'vue';
+import { drainageDispatchMonitorData } from '@/api/FloodControlAndDrainage.js';
+import bus from '@/bus';
 import _bus from '@/bus';
 const { proxy } = getCurrentInstance();
 const props = defineProps({
@@ -108,9 +104,8 @@
 );
 
 const atData = ref({
-  text:
-    "南湖，位于湖北省武汉市洪山区（部分为东湖新技术开发区托管）南部，南抵狮子山，北连龙王嘴、刘王嘴、尤李村，北港等自然村，东为石头村，部分水域在江夏区境内，岸线长23.02千米，水域面积7.67平方千米。",
-  img: "@/assets/images/pictureOnMap/maxBgc.png",
+  text: '南湖，位于湖北省武汉市洪山区（部分为东湖新技术开发区托管）南部，南抵狮子山，北连龙王嘴、刘王嘴、尤李村，北港等自然村，东为石头村，部分水域在江夏区境内，岸线长23.02千米，水域面积7.67平方千米。',
+  img: '@/assets/images/pictureOnMap/maxBgc.png',
 });
 // 获取tab数据
 const loading = ref(false);
@@ -119,39 +114,35 @@
 function gitDataFun() {
   loading.value = true;
   let params = {
-    monitorType: "hhsq",
+    monitorType: 'hhsq',
   };
   drainageDispatchMonitorData(params).then(
-    (res) => {
-      console.log("获取监测预警 河湖水情数据", res);
+    res => {
+      console.log('获取监测预警 河湖水情数据', res);
       loading.value = false;
       if (res && res.code == 200) {
         listData.value = res.data;
         activeObj.value = res.data?.[0];
-        activeObj.value.imgArr = activeObj.value.fileUrl
-          ? activeObj.value.fileUrl.split(",")
-          : [];
+        activeObj.value.imgArr = activeObj.value.fileUrl ? activeObj.value.fileUrl.split(',') : [];
         // console.log('activeObj2111',activeObj.value);
       }
     },
-    (error) => {
+    error => {
       loading.value = false;
     }
   );
 }
-const activeObj = ref("");
+const activeObj = ref('');
 
 function popUpFun(item) {
-  console.log("点击河湖水情数据", item);
-    activeObj.value = item;
+  console.log('点击河湖水情数据', item);
+  activeObj.value = item;
 
-  activeObj.value.imgArr = activeObj.value.fileUrl
-    ? activeObj.value.fileUrl.split(",")
-    : [];
-        console.log('activeObj.value.fileUrl',activeObj.value);
+  activeObj.value.imgArr = activeObj.value.fileUrl ? activeObj.value.fileUrl.split(',') : [];
+  console.log('activeObj.value.fileUrl', activeObj.value);
 
-  _bus.emit("panelDataToMap", {...item,id:undefined})
-  bus.emit("DynamicBus", item);
+  _bus.emit('panelDataToMap', { ...item, id: undefined });
+  bus.emit('DynamicBus', item);
 }
 onMounted(() => {
   gitDataFun();
@@ -163,8 +154,7 @@
   .sumShow {
     width: 100%;
     height: 100px;
-    background: url("@/assets/images/pictureOnMap/statisticalcardbackground.png")
-      no-repeat center;
+    background: url('@/assets/images/pictureOnMap/statisticalcardbackground.png') no-repeat center;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-around;
@@ -173,11 +163,7 @@
       .distext {
         width: 101px;
         height: 18px;
-        background: linear-gradient(
-          90deg,
-          rgba(3, 0, 0, 0.1),
-          rgba(49, 82, 172, 0.4)
-        );
+        background: linear-gradient(90deg, rgba(3, 0, 0, 0.1), rgba(49, 82, 172, 0.4));
         position: relative;
         span {
           position: absolute;
@@ -205,11 +191,7 @@
 
     .thBox {
       height: 40px;
-      background: linear-gradient(
-        0deg,
-        rgba(0, 98, 183, 0.8) 0%,
-        rgba(0, 98, 183, 0.1) 100%
-      );
+      background: linear-gradient(0deg, rgba(0, 98, 183, 0.8) 0%, rgba(0, 98, 183, 0.1) 100%);
       border: 1px solid #0b9bff;
       line-height: 40px;
       display: flex;
@@ -224,7 +206,7 @@
     }
     .tdBox {
       border-bottom: 1px solid #163f80;
-      font-family: "SourceHanSansCN-Regular";
+      font-family: 'SourceHanSansCN-Regular';
       .eachInfo {
         display: flex;
         height: 36px;
@@ -272,7 +254,7 @@
         // border: 1px solid #163F80;
       }
       .clickEachInfo {
-        background: linear-gradient(0deg, #001f75 0%, #257894 100%)!important;
+        background: linear-gradient(0deg, #001f75 0%, #257894 100%) !important;
         // background: #2cb7ff!important;
       }
       .eachInfo:hover {