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

fuliqi

2024-07-26 e9ac312fdfdf723dfc5b97dbf56df9c339f635f9

 src/views/meet/index.vue

@@ -1,33 +1,35 @@
<template>
  <div>
    <div style="display: flex; flex-direction: row; position: relative">
      <div id="meet" ref="meet"/>
      <div style="padding: 5px;position: absolute;right: 0">
        <el-button type="primary" size="small" @click="showStudent = ! showStudent" style="float: right">{{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="22">
              <el-input placeholder="搜索" size="small" clearable @input="getStudentList" @clear="getStudentList" v-model="searchForm.keyword"/>
            <el-col :span="12">
              <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>
            </el-col>
            <el-tabs v-model="searchForm.onlineStatus" @tab-click="handleTabChange" style="margin-left: 3px">
              <el-tab-pane label="在线学员" name="1"></el-tab-pane>
              <el-tab-pane label="离线学员" name="0"></el-tab-pane>
            </el-tabs>
            <el-row :gutter="20" v-for="student in showStudentList" :key="student.id" class="student-row">
              <el-col :span="18">
                <div>
                  {{student.realName}}
                </div>
              </el-col>
              <el-col :span="6">
                <div :class="{online: student.onlineStatus === 1, outline: student.onlineStatus === 0}">
                  {{getStatus(student.onlineStatus)}}
                </div>
              </el-col>
            </el-row>
          </el-row>
          <el-tabs v-model="searchForm.onlineStatus" @tab-click="handleTabChange" style="margin-left: 3px">
            <el-tab-pane label="在线学员" name="1"></el-tab-pane>
            <el-tab-pane label="离线学员" name="0"></el-tab-pane>
          </el-tabs>
          <el-row :gutter="20" v-for="student in showStudentList" :key="student.id" class="student-row">
            <el-col :span="18">
              <div>
                {{ student.realName }}
              </div>
            </el-col>
            <el-col :span="6">
              <div :class="{online: student.onlineStatus === 1, outline: student.onlineStatus === 0}">
                {{ getStatus(student.onlineStatus) }}
              </div>
            </el-col>
          </el-row>
        </el-row>
      </div>
@@ -38,10 +40,12 @@
<script>
import { getStudentList } from '@/api/meet'

let jitsiApi = null
export default {
  data () {
    return {
      jitsiApi: null,
      width: 0,
      height: 0,
      showStudent: true,
      intervalId: null,
      meetId: null,
@@ -57,11 +61,17 @@
    }
  },
  methods: {
    getShowText() {
    hiddenStudent () {
      this.showStudent = !this.showStudent
    },
    changeJitsiWindowSize (width, height) {
      this.jitsiApi.resizeLargeVideo(width, height)
    },
    getShowText () {
      if (this.showStudent) {
        return '隐藏在线情况'
        return '隐藏'
      } else {
        return '展示在线情况'
        return '显示'
      }
    },
    getStatus (status) {
@@ -89,7 +99,7 @@
      })
    },
    getRoomInfo () {
      jitsiApi.getRoomsInfo().then(rooms => {
      this.jitsiApi.getRoomsInfo().then(rooms => {
        rooms.rooms.forEach(room => {
          // 房间的id是一个子域名，且@符前的会议名称是经过URL编码的
          let encodedPart = room.id.split('@')[0]
@@ -119,8 +129,7 @@
    }
  },
  mounted () {
    const width = window.innerWidth * 0.8
    const height = window.innerHeight
    this.height = window.innerHeight
    this.meetId = this.$route.query.meetId
    this.getStudentList()
    const domain = this.$route.query.domain
@@ -130,8 +139,7 @@
    const userInfo = userInfoStr ? JSON.parse(userInfoStr) : null
    const options = {
      roomName: roomName,
      width: width,
      height: height,
      height: this.height,
      parentNode: this.$refs.meet,
      lang: 'zh_CN',
      userInfo: userInfo,
@@ -139,16 +147,62 @@
        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']
      }
    }

    jitsiApi = new window.JitsiMeetExternalAPI(domain, options)
    this.jitsiApi = new window.JitsiMeetExternalAPI(domain, options)

    jitsiApi.addListener('readyToClose', () => {
    this.jitsiApi.addListener('readyToClose', () => {
      window.close()
    })
    // 每三秒更学员在线状态
@@ -171,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;