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

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

src/views/emergencyCommandMap/LeftSection/Communication.vue

@@ -97,13 +97,25 @@
         </div>
       </div>
     </div>
+    
     <Drone v-show="activeIndex === 1"></Drone>
+    
     <IndividualEquipment v-show="activeIndex === 2"></IndividualEquipment>
-    <Dialog v-if="showJoinMeeting" custom-show type="xs" height="500px" title="加入会议" @confirm="handleJoinMeeting" @close="closeDialog">
+
+    <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>
+
+        <el-form-item label="账号" label-width="200px" prop="username">
+          <el-input v-model="meetingForm.username" class="custom-input2" clearable placeholder="请输入设备账号" />
+        </el-form-item>
+
+        <el-form-item label="密码" label-width="200px" prop="userpass">
+          <el-input v-model="meetingForm.userpass" class="custom-input2" clearable placeholder="请输入设备密码" />
+        </el-form-item>
       </el-form>
     </Dialog>
   </div>
@@ -221,10 +233,14 @@ const deleteItem = (item) => {
 let formRef = ref();
 let showJoinMeeting = ref(false);
 let meetingForm = reactive({
-  roomcode: ''
+  roomcode: '',
+  username: '',
+  userpass: ''
 });
 const rules = reactive({
-  roomcode: [{ required: true, message: '会议号不能为空', trigger: 'blur' }]
+  roomcode: [{ required: true, message: '会议号不能为空', trigger: 'blur' }],
+  username: [{ required: true, message: '会议账号不能为空', trigger: 'blur' }],
+  userpass: [{ required: true, message: '会议密码不能为空', trigger: 'blur' }]
 });
 // 点击会议号入会
 const showJoinMeetingDialog = () => {
@@ -241,8 +257,8 @@ const handleJoinMeeting = () => {
       const screenWidth = window.screen.width * window.devicePixelRatio;
       const screenHeight = window.screen.height * window.devicePixelRatio;
       const data = {
-        'userid': 'mmyj0009', // 空表示后台获取当前用户对应融合通信dev_id
-        'password': '123',
+        userid: meetingForm.username, // 空表示后台获取当前用户对应融合通信dev_id
+        password: meetingForm.userpass || '123',
         roomcode: meetingForm.roomcode, // 会议号
         windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true }
       };
@@ -253,6 +269,9 @@ const handleJoinMeeting = () => {
         a.href = res.data;
         // 触发点击事件
         a.click();
+
+        // 保存账号和密码，待加入相关代码
+        // ....
       });
       closeDialog();
     }