Merge branch 'main' of http://42.192.7.176:3000/suojin/HIYL-localization-web

# Conflicts:
#	src/views/videoCommunication/index.vue

src/views/videoCommunication/components/ConsultationCaseStatsDialog.vue

@@ -1,52 +1,27 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    title="会诊病例数统计"
-    width="420px"
-    :show-close="false"
-    :close-on-click-modal="false"
-    append-to-body
-    custom-class="stats-case-dialog"
-  >
+  <el-dialog :visible.sync="visible" title="会诊病例数统计" width="420px" :show-close="false" :close-on-click-modal="false"
+    append-to-body custom-class="stats-case-dialog">
     <div class="stats-form">
       <div class="stats-row">
         <div class="stats-label">总病例数</div>
-        <el-input
-          v-model.number="form.total_patients"
-          type="number"
-          min="0"
-          class="stats-input"
-        />
+        <el-input v-model.number="form.total_patients" type="number" min="0" class="stats-input" />
         <span class="stats-unit">人</span>
       </div>
       <div class="stats-row">
         <div class="stats-label">阳性病例数</div>
-        <el-input
-          v-model.number="form.positive_patients"
-          type="number"
-          min="0"
-          class="stats-input"
-        />
+        <el-input v-model.number="form.positive_patients" type="number" min="0" class="stats-input" />
         <span class="stats-unit">人</span>
       </div>
       <div class="stats-row">
         <div class="stats-label">转诊病例数</div>
-        <el-input
-          v-model.number="form.transfer_patients"
-          type="number"
-          min="0"
-          class="stats-input"
-        />
+        <el-input v-model.number="form.transfer_patients" type="number" min="0" class="stats-input" />
         <span class="stats-unit">人</span>
       </div>
     </div>
 
     <div slot="footer" class="dialog-footer">
-      <el-button
-        :class="isFormValid ? 'btn-confirm-valid' : 'btn-confirm-disabled'"
-        :disabled="!isFormValid"
-        @click="handleConfirm"
-      >确定</el-button>
+      <el-button :class="isFormValid ? 'btn-confirm-valid' : 'btn-confirm-disabled'" :disabled="!isFormValid"
+        @click="handleConfirm">确定</el-button>
       <el-button class="btn-close" @click="handleClose">关闭</el-button>
     </div>
   </el-dialog>
@@ -151,9 +126,20 @@ export default ConsultationCaseStatsDialog;
 
 <style lang="scss">
 .stats-case-dialog {
+
   .el-dialog__header {
-    padding: 20px 20px 10px;
+    padding: 0px 20px 10px;
     border-bottom: none;
+
+    &::before {
+      content: '';
+      display: inline-block;
+      width: 0 !important;
+      height: 0 !important;
+      background-color: #009688;
+      border-radius: 2px;
+      margin-right: 8px;
+    }
   }
 
   .el-dialog__title {

src/views/videoCommunication/realTimeConsultation.vue

@@ -458,7 +458,7 @@ export default {
       window.hirtcwebsdk.init({
         serviceID: '56da5fd8921f4f7093a42e2a',
         serviceKey: '2c17c6393771ee3048ae34d6b965sdew',
-        BasicRoomServiceToken: "https://192.168.69.174:3001/v1/auth/token",
+        Services: { BasicRoomServiceToken: "https://192.168.69.174:3001/v1/auth/token" },
         cameraLayers: [
           {
             width: 320,
@@ -492,11 +492,12 @@ export default {
       const uid = String(this.$store.state.user.id || Date.now());
       const uName = (this.$store.state.user.name || '用户').trim();
       console.log(roomId, uid, uName)
-      window.hirtcwebsdk.join('1006110', uid, uName);
       window.hirtcwebsdk.addListener('joined', () => {
         this.$message.success('加入会议成功');
         this.updateParticipantCount();
       });
+      window.hirtcwebsdk.join(this.$route.query.roomId_id, uid, uName);
+
       window.hirtcwebsdk.addListener('user-joined', this.updateParticipantCount);
       window.hirtcwebsdk.addListener('user-left', this.updateParticipantCount);
     },