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

fuliqi

2024-07-26 e9ac312fdfdf723dfc5b97dbf56df9c339f635f9

 src/views/meet/index.vue

@@ -1,13 +1,15 @@
<template>
  <div>
    <div style="display: flex; flex-direction: row; position: relative">
      <div id="meet" ref="meet"/>
      <div style="padding-top: 5px; padding-left: 5px; position: absolute;right: 15px">
        <el-button type="success" size="small" @click="hiddenStudent" >{{getShowText()}}</el-button>
    <div style="display: flex; flex-direction: row;">
      <div id="meet" ref="meet" style="flex-grow: 1;">
      </div>
      <div style="padding-top: 5px; padding-left: 5px;right: 15px">
        <el-button type="success" size="small" @click="hiddenStudent">{{ getShowText() }}</el-button>
        <el-row v-show="showStudent">
          <el-row :gutter="5">
            <el-col :span="12">
              <el-input placeholder="搜索学员" size="small" clearable @input="getStudentList" @clear="getStudentList" v-model="searchForm.keyword"/>
              <el-input placeholder="搜索学员" size="small" clearable @input="getStudentList" @clear="getStudentList"
                        v-model="searchForm.keyword"/>
            </el-col>
            <el-col :span="2">
              <el-button type="primary" size="small" @click="getStudentList">搜索</el-button>
@@ -20,12 +22,12 @@
          <el-row :gutter="20" v-for="student in showStudentList" :key="student.id" class="student-row">
            <el-col :span="18">
              <div>
                {{student.realName}}
                {{ student.realName }}
              </div>
            </el-col>
            <el-col :span="6">
              <div :class="{online: student.onlineStatus === 1, outline: student.onlineStatus === 0}">
                {{getStatus(student.onlineStatus)}}
                {{ getStatus(student.onlineStatus) }}
              </div>
            </el-col>
          </el-row>
@@ -127,7 +129,6 @@
    }
  },
  mounted () {
    this.width = window.innerWidth * 0.8
    this.height = window.innerHeight
    this.meetId = this.$route.query.meetId
    this.getStudentList()
@@ -138,7 +139,6 @@
    const userInfo = userInfoStr ? JSON.parse(userInfoStr) : null
    const options = {
      roomName: roomName,
      width: this.width,
      height: this.height,
      parentNode: this.$refs.meet,
      lang: 'zh_CN',
@@ -147,11 +147,57 @@
        prejoinConfig: {
          enabled: false
        },
        // 禁用邀请
        disableInviteFunctions: true,
        // 禁用邮箱
        gravatar: {
          disabled: true
        },
        // 禁用改名
        readOnlyName: true,
        // 自定义按钮
        toolbarButtons: [
          // 摄像头
          'camera',
          // 聊天
          'chat',
          // 'closedcaptions',
          // 共享
          'desktop',
          'download',
          // 'embedmeeting',
          // 'etherpad',
          // 'feedback',
          // 'filmstrip',
          'fullscreen',
          'hangup',
          // 'help',
          'highlight',
          // 'invite',
          'linktosalesforce',
          'livestreaming',
          'microphone',
          'noisesuppression',
          // 'participants-pane',
          // 'profile',
          // 'raisehand',
          'recording',
          // 'security',
          'select-background',
          'settings',
          'shareaudio',
          'sharedvideo',
          'shortcuts',
          'stats',
          'tileview',
          'toggle-camera',
          // 'videoquality',
          'whiteboard'
        ],
        whiteboard: {
          enabled: true
        }
      },
      toolbarButtons: ['whiteboard']
      }
    }

    this.jitsiApi = new window.JitsiMeetExternalAPI(domain, options)
@@ -179,16 +225,20 @@
#meet {
  height: 100%;
}

.online {
  color: #42b983;
}

.outline {
  color: #aa1111;
}

.studentWarp {
  display: flex;
  flex-direction: row;
}

.student-row {
  margin-top: 8px;
  padding-left: 3px;