diff --git a/src/api/api.js b/src/api/api.js index f8abb7f..17ec9bf 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -93,6 +93,8 @@ const getUserNoticeInfo= (params)=>getAction('/sys/sysAnnouncementSend/getMyAnno const getTransitURL = url => `/sys/common/transitRESTful?url=${encodeURIComponent(url)}` // 通过文件的id获取文件的相应信息 const getFileInfo = (params) => getAction('/sys/oss/file/queryById', params) +// 通过多个文件的ids 获取文件的相应信息 +const getFileInfoByIds = (params) => getAction('/sys/oss/file/queryByIds', params) // 中转HTTP请求 export const transitRESTful = { get: (url, parameter) => getAction(getTransitURL(url), parameter), @@ -156,7 +158,8 @@ export { queryMyDepartTreeList, getUserNoticeInfo, getDictItemsFromCache, - getFileInfo + getFileInfo, + getFileInfoByIds } diff --git a/src/components/detailPage/MeetingList.vue b/src/components/detailPage/MeetingList.vue index bf1ccb5..701ddd9 100644 --- a/src/components/detailPage/MeetingList.vue +++ b/src/components/detailPage/MeetingList.vue @@ -214,7 +214,7 @@ export default { }, methods: { compareCurrentTime, - loadData(arg, callback) { + loadData(arg, callback, situationId) { if (!this.url.list) { this.$message.error('请设置url.list属性!') return @@ -238,7 +238,7 @@ export default { } else { this.ipagination.total = 0 } - callback && callback() + callback && callback(situationId) //update-end---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ } if (res.code === 510) { @@ -286,15 +286,15 @@ export default { // 嘉宾上传会议资料后的回调函数 fileRefreshData(situationId) { const callback = (situationId) => { + if (!situationId) return let item = this.dataSource.find(item => item.situationId === situationId) item && this.openMeetingDetail(item) } // 重新请求数据,并执行打开弹窗的回调函数 - this.loadData(null, callback(situationId)) + this.loadData(null, callback, situationId) } }, created() { - console.log('***************') this.loadData(1) } } diff --git a/src/views/MessagePage/modules/FileTable.vue b/src/views/MessagePage/modules/FileTable.vue index 5aa401d..86952a4 100644 --- a/src/views/MessagePage/modules/FileTable.vue +++ b/src/views/MessagePage/modules/FileTable.vue @@ -22,7 +22,7 @@