diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index 91fc98fc..2cdfd140 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -409,12 +409,12 @@
-

+

备选 {{ pagination.total || 0 }}

-

+

已选 {{ selectedRowKeys.length }} 个 @@ -458,15 +458,17 @@ 添加至申购车 @@ -488,7 +490,10 @@

-
+
+
+ +
{ + 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) }) } @@ -1011,12 +1051,9 @@ title: '设施类型', content: isXiHaiAn ? ['视频资源'] - : [ - '政务云资源', - '视频资源' /**',感知资源' */, - '城市云脑会客厅', - '视频会议', - ], + : username == 'admin' + ? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议'] + : ['政务云资源', '视频资源', '城市云脑会客厅'], }, ]) let clickList = ref([]) //存储点击的tab @@ -1641,6 +1678,7 @@ if (name == '政务云资源' || name == '视频会议' || name == '感知资源') { dataSource.value = [] dataSource2.value = [] + console.log('视频会议=========>', dataSource, columns) pagination.value.total = 0 } else { if (name !== '无人机' && name !== '单兵设备') { @@ -2034,6 +2072,20 @@ 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, { @@ -2094,6 +2146,32 @@ mybus.emit('selectTablePoint', selectedList.value) console.log('已选中======================>', selectedList.value) } + const onSelectChange2 = ( + record, + selected, + selectedRows, + nativeEvent, + type + ) => { + console.log( + '已选中======================>', + record, + selected, + selectedRows, + nativeEvent, + type + ) + if (selected) { + selectedRowKeys.value.push(record.name) + selectedRows.value.push(record.name) + } else { + selectedRowKeys.value.splice( + selectedRowKeys.value.indexOf(record.name), + 1 + ) + selectedRows.value.splice(selectedRowKeys.value.indexOf(record.name), 1) + } + } const onSelectAll = (selected, selectedRows, changeRows) => { if (selected) { changeRows.map((val) => { @@ -2128,6 +2206,12 @@ console.log('heiheiheiehiehei', selected, selectedRows, changeRows) mybus.emit('selectTablePoint', selectedList.value) } + const onSelectAll2 = (selected, selectedRows, changeRows) => { + console.log(selected, selectedRows, changeRows) + if (selected) { + } else { + } + } // 切换tab const handleTableChange = (val) => {