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

src/views/emergencyCommandMap/LeftSection/Communication.vue

@@ -99,7 +99,7 @@
     </div>
     <Drone v-show="activeIndex === 1"></Drone>
     <IndividualEquipment v-show="activeIndex === 2"></IndividualEquipment>
-    <Dialog v-if="showJoinMeeting" customShow type="xs" height="500px" title="加入会议" @confirm="handleJoinMeeting" @close="closeDialog">
+    <Dialog v-if="showJoinMeeting" custom-show type="xs" height="500px" 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="请输入会议号" />
@@ -240,7 +240,7 @@ const handleJoinMeeting = () => {
       const screenWidth = window.screen.width * window.devicePixelRatio;
       const screenHeight = window.screen.height * window.devicePixelRatio;
       const data = {
-        'userid': '', // 空表示后台获取当前用户对应融合通信dev_id
+        'userid': 'mmyj0009', // 空表示后台获取当前用户对应融合通信dev_id
         'password': '123',
         roomcode: meetingForm.roomcode, // 会议号
         windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true }
@@ -273,7 +273,7 @@ const handleStartCall = () => {
   const screenWidth = window.screen.width * window.devicePixelRatio;
   const screenHeight = window.screen.height * window.devicePixelRatio;
   const data = {
-    userid: '', // 空表示后台获取当前用户对应融合通信dev_id
+    userid: 'mmyj0009', // 空表示后台获取当前用户对应融合通信dev_id
     password: '',
     windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true },
     members: {
@@ -306,7 +306,7 @@ const handleStartMeeting = () => {
   const screenWidth = window.screen.width * window.devicePixelRatio;
   const screenHeight = window.screen.height * window.devicePixelRatio;
   const data = {
-    'userid': '', // 空表示后台获取当前用户对应融合通信dev_id
+    'userid': 'mmyj0009', // 空表示后台获取当前用户对应融合通信dev_id
     'password': '',
     windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true },
     members: {

src/views/globalMap/RightMenu/MobilePlatform.vue

@@ -41,7 +41,7 @@
 import { Search } from '@element-plus/icons-vue';
 import { getMobileWorkstationList, getMobileWorkstationTrajectory } from '@/api/globalMap/MobilePlatform';
 import { onMounted, reactive } from 'vue';
-import { getStartMiniWithNoParam } from '@/api/emergencyCommandMap/communication';
+import { getStartMiniParam } from '@/api/emergencyCommandMap/communication';
 import { showSuccessMsg } from '@/utils/notification';
 const trackPlayback = inject('trackPlayback');
 // 数据列表,直接定义为数组
@@ -77,7 +77,7 @@ const handleConnect = () => {
   const screenWidth = window.screen.width * window.devicePixelRatio;
   const screenHeight = window.screen.height * window.devicePixelRatio;
   const data = {
-    'userid': '', // 空表示后台获取当前用户对应融合通信dev_id
+    'userid': 'mmyj0009', // 空表示后台获取当前用户对应融合通信dev_id
     'password': '123',
     roomid: '', // 空表示新会议室
     windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true },
@@ -86,7 +86,7 @@ const handleConnect = () => {
       'dev-list': dev_list
     }
   };
-  getStartMiniWithNoParam(data).then((res) => {
+  getStartMiniParam(data).then((res) => {
     // 创建一个a标签元素
     const a = document.createElement('a');
     // 设置a标签的href属性