diff --git a/front/src/api/home.js b/front/src/api/home.js index e97c9400..c065a0eb 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-01 19:19:40 * @LastEditors: Light - * @LastEditTime: 2022-10-24 10:36:56 + * @LastEditTime: 2022-10-25 09:51:56 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -110,6 +110,13 @@ export function initiateMeet(data) { data: data, }) } +export function getEnkeUsers(params) { + return request({ + url: '/enke/getEnkeUsers', + method: 'get', + params: params, + }) +} // 组件服务 export function ApplicationServe(data) { diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index a4e7809d..6aff800a 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -544,18 +544,19 @@ > @@ -782,7 +783,7 @@ defineExpose, computed, } from 'vue' - import { getUser, initiateMeet } from '@/api/home' + import { getUser, initiateMeet, getEnkeUsers } from '@/api/home' import { getCameraByParentId, getStreamByChannelCode, @@ -846,24 +847,66 @@ 'fullScreen', ], //显示所有按钮, }) - const meetingSelect = ref([]) + const meetingList = ref([]) + const meetingPagination = ref({ + total: 0, + current: 1, + pageSize: 5, //每页中显示5条数据 + showSizeChanger: false, + }) + const meetingSelect = reactive({ data: [] }) + const meetingSelectOld = reactive({ data: [] }) const meetingOnSelectChange = (selectedRowKeys) => { console.log( 'selectedRowKeys changed: ', selectedRowKeys, - meetingSelect.value + meetingSelect.data ) - meetingSelect.value = selectedRowKeys + meetingSelect.data = selectedRowKeys + meetingSelectOld.data[meetingPagination.value.current - 1] = + meetingSelect.data } - const videoList = ref([]) const initMeeting = () => { let str = '青岛市一网统揽项目组/' - meetingSelect.value.map((val) => (str += val + '/')) + // meetingSelect.data.map((val) => (str += val + '/')) + meetingSelectOld.data.map((val) => { + val.map((data) => (str += data + '/')) + }) initiateMeet(str).then((res) => { console.log('组会=========>', res) }) } + // 获取会议列表 + const meetingColumns = ref([ + { + title: '视频会议用户名称', + dataIndex: 'hostName', + key: 'hostName', + }, + ]) + const getMeetingList = () => { + getEnkeUsers({ + page: meetingPagination.value.current, + limit: meetingPagination.value.pageSize, + }).then((res) => { + meetingList.value = [] + res.data.data.list.map((val) => { + val.key = val.hostName + }) + meetingList.value = res.data.data.list + meetingPagination.value.total = res.data.data.total + meetingSelect.data = + meetingSelectOld.data[meetingPagination.value.current - 1] + console.log('会议列表=============>', res.data.data) + }) + } + getMeetingList() + const handleMeeting = (pag, filters, sorter) => { + console.log(pag, filters, sorter) + meetingPagination.value.current = pag.current + getMeetingList() + } let visible = ref(false) // 视频预览 let picVisible = ref(false) // 图片预览 let batchVisible = ref(false) // 视频批量预览 @@ -2072,20 +2115,6 @@ key: 'channelId', }, ]) - const meetingColumns = ref([ - { - title: '视频会议用户名称', - dataIndex: 'name', - key: 'name', - }, - ]) - const meetingName = ref([ - { name: '一网统揽平台组', key: '一网统揽平台组' }, - { name: '市气象局', key: '市气象局' }, - { name: '地铁集团', key: '地铁集团' }, - { name: '市公安局', key: '市公安局' }, - { name: '市交通运输局', key: '市交通运输局' }, - ]) // 西海岸--状态展示 if (isXiHaiAn) { columns.value.splice(2, 0, {