Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/views/emergencyCommandMap/LeftSection/Communication.vue

src/types/components.d.ts

@@ -44,6 +44,8 @@ declare module 'vue' {
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
+    ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']

src/views/emergencyCommandMap/LeftSection/Communication.vue

@@ -104,7 +104,6 @@
 
     <Dialog v-if="showJoinMeeting" custom-show type="xs" height="760px" title="加入会议" @confirm="handleJoinMeeting" @close="closeDialog">
       <el-form ref="formRef" :model="meetingForm" :rules="rules">
-
         <el-form-item label="会议号" label-width="200px" prop="roomcode">
           <el-input v-model="meetingForm.roomcode" class="custom-input2" clearable placeholder="请输入会议号" />
         </el-form-item>
@@ -139,7 +138,6 @@
         </el-form-item>
       </el-form>
     </Dialog>
-
   </div>
 </template>
 
@@ -318,8 +316,8 @@ const handleJoinMeeting = () => {
         a.click();
 
         // 保存账号和密码
-        localStorage.setItem('meeting_username', meetingForm.username)
-        localStorage.setItem('meeting_userpass', meetingForm.userpass)
+        localStorage.setItem('meeting_username', meetingForm.username);
+        localStorage.setItem('meeting_userpass', meetingForm.userpass);
       });
       closeDialog();
     }
@@ -360,17 +358,17 @@ const handleStartCall = () => {
         a.click();
 
         // 保存账号和密码
-        localStorage.setItem('meeting_username', openMeetingForm.username)
-        localStorage.setItem('meeting_userpass', openMeetingForm.userpass)
+        localStorage.setItem('meeting_username', openMeetingForm.username);
+        localStorage.setItem('meeting_userpass', openMeetingForm.userpass);
       });
       closeOpenDialog();
     }
-  })
+  });
 };
 
 onMounted(() => {
-  const meeting_username = localStorage.getItem('meeting_username') || "";
-  const meeting_userpass = localStorage.getItem('meeting_userpass') || "";
+  const meeting_username = localStorage.getItem('meeting_username') || '';
+  const meeting_userpass = localStorage.getItem('meeting_userpass') || '';
   meetingForm.username = meeting_username;
   meetingForm.userpass = meeting_userpass;
   openMeetingForm.username = meeting_username;

src/views/globalMap/RightMenu/TyphoonVideo.vue

@@ -125,7 +125,6 @@ const initDataByTyphoon = async () => {
   }
 };
 
-
 const fetchData = async (apiFunction, params) => {
   try {
     const response = await apiFunction(params);
@@ -168,7 +167,6 @@ const initData = async () => {
     console.error('Error initializing data:', error);
   }
 };
-
 </script>
 
 <style lang="scss" scoped>