diff --git a/src/api/intelligent-agent/list.js b/src/api/intelligent-agent/list.js index ca6e9ac..4043b02 100644 --- a/src/api/intelligent-agent/list.js +++ b/src/api/intelligent-agent/list.js @@ -77,5 +77,23 @@ const agentEdit = data => { data }) } +/** + * 编辑智能体 + * @param {Object} data - 请求参数, 默认为空对象 + * @returns {Promise} - 返回 Promise 对象 + */ +const getAccessToken = data => { + return request({ + url: getUrl('/third/access_token'), + method: 'get' + }) +} -export { agentList, agentEdit, agentDelete, agentAdd, agentDetail } +export { + agentList, + agentEdit, + agentDelete, + agentAdd, + agentDetail, + getAccessToken +} diff --git a/src/components/RenderCropper/index.vue b/src/components/RenderCropper/index.vue index d6276ba..ea246bf 100644 --- a/src/components/RenderCropper/index.vue +++ b/src/components/RenderCropper/index.vue @@ -24,6 +24,7 @@ :visible.sync="visible" @confirm="confirm" width="600px" + append-to-body >
@@ -94,8 +95,30 @@ export default { } } }, - props: {}, - watch: {}, + props: { + list: { + type: Array, + default: () => [] + }, + url: { + type: String, + default: '' + } + }, + watch: { + url: { + handler(val) { + this.fileList = [] + if (val) { + this.fileList.push({ + url: val + }) + } + }, + immediate: true, + deep: true + } + }, components: {}, filters: {}, methods: { @@ -118,8 +141,9 @@ export default { // 文件生成 bolburl const blobUrl = URL.createObjectURL(res) res.url = blobUrl + this.fileList = [] this.fileList.push(res) - this.$emit('getFiles', this.fileList) + this.$emit('getFiles', [res]) this.visible = false }) // 根据canvas 生成一个图片 diff --git a/src/router/generatedRouter/index.js b/src/router/generatedRouter/index.js index 5f2294a..8d067e5 100644 --- a/src/router/generatedRouter/index.js +++ b/src/router/generatedRouter/index.js @@ -251,7 +251,9 @@ export default [ component: () => import('@/views/intelligent-agent/index.vue'), meta: { title: 'AI智能体', - icon: 'icon-notebook' + icon: 'icon-notebook', + accessToken: '', + refreshToken: '' } } ] diff --git a/src/views/intelligent-agent/index.vue b/src/views/intelligent-agent/index.vue index 10f6fbd..e74bbf9 100644 --- a/src/views/intelligent-agent/index.vue +++ b/src/views/intelligent-agent/index.vue @@ -2,7 +2,8 @@ import { agentList, agentDelete, - agentDetail + agentDetail, + getAccessToken } from '@/api/intelligent-agent/list' import Info from '@/views/intelligent-agent/components/info' import agent from '@/views/agent' @@ -69,7 +70,7 @@ export default { this.page += 1 this.fetchAgentList({ page: this.page, - pageSize: 3 + pageSize: this.pageSize }) }, /** @@ -136,10 +137,17 @@ export default { }, async handleClickAgent(item) { const { content } = await agentDetail(item.id) + + const thirdContent = await getAccessToken() let agent = content.content this.agentConfig.title = agent.appName + ' - 智能体详情' this.agentConfig.agent = agent - this.agentConfig.visible = true + // 传递新的token + this.$route.meta.refreshToken = thirdContent.content.content.refreshToken + this.$route.meta.accessToken = thirdContent.content.content.accessToken + setTimeout(() => { + this.agentConfig.visible = true + }) }, // 创建智能体弹窗确认 diff --git a/src/views/knowledge/detail/components/knowledgeForm.vue b/src/views/knowledge/detail/components/knowledgeForm.vue index 0665cb6..94fbfc6 100644 --- a/src/views/knowledge/detail/components/knowledgeForm.vue +++ b/src/views/knowledge/detail/components/knowledgeForm.vue @@ -39,39 +39,8 @@ - - - -
- - - - - - - - - -
-
+ + @@ -80,7 +49,7 @@ 取消 { this.$emit('update:visible', val) + + if (this.datasetId) { + this.getDetail() + } else { + this.model = { + description: '', + name: '', + segmentedMode: 0, + visibleRange: 0, + userIds: [], + image: null, + imageType: 'upload-img', + id: null + } + } }) }, immediate: true - }, - - datasetId(val) { - if (val) { - this.getDetail() - } else { - this.model = { - description: '', - name: '', - segmentedMode: 0, - id: null - } - } } + + // datasetId(val) { + // if (val) { + // this.getDetail() + // } else { + // this.model = { + // description: '', + // name: '', + // segmentedMode: 0, + // visibleRange: 0, + // userIds: [], + // image: null, + // imageType: 'upload-img', + // id: null + // } + // } + // } }, components: {}, filters: { @@ -189,17 +182,17 @@ export default { } }, methods: { - handleRemove(file) { - console.log(file) - }, - handlePictureCardPreview(file) { - this.dialogImageUrl = file.url - this.dialogVisible = true - }, - handleDownload(file) { - console.log(file) + getFiles(file) { + let formData = new FormData() + formData.append('file', file[0]) + uploadImage(formData).then(res => { + if (res) { + this.$set(this.model, 'image', res.content.content.imageUrl) + } + }) }, + handleRemove(file) {}, jumpKnowledgeList() { this.$router.push({ path: '/knowledge/list' @@ -222,19 +215,37 @@ export default { } }) }, + resetForm() { + this.model = { + description: '', + name: '', + segmentedMode: 0, + visibleRange: 0, + userIds: [], + image: null, + imageType: 'upload-img', + id: null + } + }, + save() { this.$refs.model.validate(valid => { if (!valid) { return false } + + this.model.visibleRange = 0 ;(!this.datasetId ? datasetCreate : datasetUpdate)(this.model).then( res => { if (res) { // 添加保存成功的提示 this.$message.success('保存成功') - this.model.id = res.content.content.id + // this.model.id = res.content.content.id // this.infoDialogVisible = true this.$emit('update:visible', false) + + this.resetForm() + // this.$router.go(-1) } } diff --git a/src/views/knowledge/detail/index.vue b/src/views/knowledge/detail/index.vue index 92cc824..f32b0b0 100644 --- a/src/views/knowledge/detail/index.vue +++ b/src/views/knowledge/detail/index.vue @@ -1,11 +1,14 @@