diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index 445c423a..2cdfd140 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -547,12 +547,15 @@ :dataSource="meetingName" :columns="meetingColumns" :scroll="{ y: tableHeight }" - rowKey="channelId" + rowKey="key" :rowClassName=" (record, index) => (index % 2 === 1 ? 'table-striped' : null) " :showSizeChanger="false" - :row-selection="rowSelection" + :row-selection="{ + selectedRowKeys: meetingSelect, + onChange: meetingOnSelectChange, + }" > @@ -801,6 +804,9 @@ import dayjs from 'dayjs' import { Form } from 'ant-design-vue' import moment from 'moment' + import { useStore } from 'vuex' + const store = useStore() + const username = store.getters['user/username'] const props = defineProps({ // 模糊查 searchValue: { type: String, default: '' }, @@ -841,30 +847,20 @@ ], //显示所有按钮, }) const meetingSelect = ref([]) - const rowSelection = ref({ - checkStrictly: false, - onChange: (selectedRowKeys, selectedRows) => { - console.log( - `selectedRowKeys: ${selectedRowKeys}`, - 'selectedRows: ', - selectedRows - ) - }, - onSelect: (record, selected, selectedRows) => { - console.log(record, selected, selectedRows) - // if (selected) { - // selectedRows.push(record.key) - // } else { - // selectedRows.splice(selectedRows.indexOf(record.key), 1) - // } - }, - onSelectAll: (selected, selectedRows, changeRows) => { - console.log(selected, selectedRows, changeRows) - }, - }) + const meetingOnSelectChange = (selectedRowKeys) => { + console.log( + 'selectedRowKeys changed: ', + selectedRowKeys, + meetingSelect.value + ) + meetingSelect.value = selectedRowKeys + } + const videoList = ref([]) const initMeeting = () => { - initiateMeet('青岛市一网统揽项目组/一网统揽平台组/').then((res) => { + let str = '' + meetingSelect.value.map((val) => (str += val + '/')) + initiateMeet(str).then((res) => { console.log('组会=========>', res) }) } @@ -1055,12 +1051,9 @@ title: '设施类型', content: isXiHaiAn ? ['视频资源'] - : [ - '政务云资源', - '视频资源' /**',感知资源' */, - '城市云脑会客厅', - '视频会议', - ], + : username == 'admin' + ? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议'] + : ['政务云资源', '视频资源', '城市云脑会客厅'], }, ]) let clickList = ref([]) //存储点击的tab