diff --git a/src/api/generatedApi/system.js b/src/api/generatedApi/system.js index 91d1644..dd6a223 100644 --- a/src/api/generatedApi/system.js +++ b/src/api/generatedApi/system.js @@ -41,6 +41,14 @@ export function getUserPage(data) { data }) } +// 用户list +export function getUserList(data) { + return request({ + url: getUrl('/sysUser/list'), + method: 'post', + data + }) +} // 修改用户状态 export function changeUserStatus(params) { return request({ diff --git a/src/views/knowledge/detail/index.vue b/src/views/knowledge/detail/index.vue index a6c2cf7..f329bfc 100644 --- a/src/views/knowledge/detail/index.vue +++ b/src/views/knowledge/detail/index.vue @@ -121,18 +121,24 @@ - - + + + - - - + + + + + + + + { + this.createdUserOptions = res.content.content.map(item => { + return { + label: item.realName, + value: item.userName + } + }) + }) + }, // 开启编辑 知识库标题 editKnowledgeName() { this.editKnowledge = true @@ -489,6 +506,8 @@ export default { this.getKnowledgeDetail() // 获取知识库文件列表 this.getKnowledgeFiledList() + // 获取用户下拉列表 + this.getUserData() let documentId = sessionStorage.getItem('documentId') if (documentId) { setTimeout(() => { diff --git a/src/views/track/Index.vue b/src/views/track/Index.vue index a4baea5..91f96a5 100644 --- a/src/views/track/Index.vue +++ b/src/views/track/Index.vue @@ -4,6 +4,7 @@ import { docManageDataset } from '@/api/generatedApi' import KnowledgeInfo from '@/views/track/views/knowledge-info/Index.vue' +import { getUserList } from '@/api/generatedApi/system' export default { components: { @@ -17,12 +18,13 @@ export default { form: { datasetId: '', datasetValue: '', - uploadUser: '', + createdUserLike: '', documentStatus: '', // 知识文件名称(新字段) knowledgeName: '', taskTime: [] }, + createdUserOptions: [], datasetList: [], tableConfig: { uploadStatusType: { @@ -48,8 +50,7 @@ export default { ) } }, - // 上传用户 现在只有 admin . 后面需要自己添加 - { prop: 'userName', key: '上传用户', width: '100' }, + { prop: 'createdUser', key: '上传用户', width: '100' }, { prop: 'createdDate', key: '上传时间', width: '200' }, { key: '操作', @@ -69,13 +70,6 @@ export default { } }, computed: { - /** - * 获取上传用户列表 - */ - getUploadUserList() { - // 进行去重处理 - return [...new Set(this.tableData.map(item => item.userName))] - }, /** * 格式化上传时间 * @returns {string[]} 格式化后的日期字符串 格式是 年-月-日 @@ -94,6 +88,16 @@ export default { } }, methods: { + getUserData() { + getUserList({}).then(res => { + this.createdUserOptions = res.content.content.map(item => { + return { + label: item.realName, + value: item.userName + } + }) + }) + }, // 搜索 handleSearch() { // 重置页码 @@ -127,8 +131,8 @@ export default { datasetId: this.form.datasetId, // // 知识文件名称 // fileName: this.form.knowledgeName, - // // 上传用户 - // userName: this.form.uploadUser, + // 上传用户 + createdUserLike: this.form.createdUserLike, // // 上传状态 // documentStatus: this.form.documentStatus, // // 任务时间 @@ -172,7 +176,7 @@ export default { datasetId: '', datasetValue: '', fileName: '', - uploadUser: '', + createdUserLike: '', documentStatus: '', taskTime: [] } @@ -187,6 +191,7 @@ export default { created() { this.getTableData() this.getKnowledgeList() + this.getUserData() } } @@ -227,13 +232,16 @@ export default { - - 全部上传用户 + +