diff --git a/bs-ui/src/api/gallery/images.js b/bs-ui/src/api/gallery/images.js index ea6b1e6..2717571 100644 --- a/bs-ui/src/api/gallery/images.js +++ b/bs-ui/src/api/gallery/images.js @@ -60,3 +60,12 @@ export function exportImages(query) { params: query }) } + +// 合并图库图片 +export function imageToGroup(data) { + return request({ + url: '/gallery/images/generateImage', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/bs-ui/src/api/task/feedback.js b/bs-ui/src/api/task/feedback.js index d88d850..9d659a9 100644 --- a/bs-ui/src/api/task/feedback.js +++ b/bs-ui/src/api/task/feedback.js @@ -60,3 +60,12 @@ export function exportFeedback(query) { params: query }) } + +// 图片任务反馈 +export function addImageFeedback(data) { + return request({ + url: '/task/feedback/addByImage', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/bs-ui/src/api/task/images.js b/bs-ui/src/api/task/images.js index 6e74bd8..2050d04 100644 --- a/bs-ui/src/api/task/images.js +++ b/bs-ui/src/api/task/images.js @@ -60,3 +60,12 @@ export function exportImages(query) { params: query }) } + +// 根据图片生成任务 +export function generateTasks(data) { + return request({ + url: '/gallery/images/generateTasks', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/bs-ui/src/assets/logo/logo_.png b/bs-ui/src/assets/logo/logo_.png new file mode 100644 index 0000000..5cbb418 Binary files /dev/null and b/bs-ui/src/assets/logo/logo_.png differ diff --git a/bs-ui/src/assets/logo/logo_white.png b/bs-ui/src/assets/logo/logo_white.png new file mode 100644 index 0000000..d6717a5 Binary files /dev/null and b/bs-ui/src/assets/logo/logo_white.png differ diff --git a/bs-ui/src/components/PhotoCart/index.vue b/bs-ui/src/components/PhotoCart/index.vue new file mode 100644 index 0000000..d7ed3aa --- /dev/null +++ b/bs-ui/src/components/PhotoCart/index.vue @@ -0,0 +1,600 @@ + + + + + \ No newline at end of file diff --git a/bs-ui/src/layout/components/Sidebar/Logo.vue b/bs-ui/src/layout/components/Sidebar/Logo.vue index 2c6ce95..94c71cd 100644 --- a/bs-ui/src/layout/components/Sidebar/Logo.vue +++ b/bs-ui/src/layout/components/Sidebar/Logo.vue @@ -15,6 +15,7 @@ @@ -85,7 +98,7 @@ export default { color: #409EFF; padding: 0 5px 4px; display: flex; - justify-content: flex-end; + align-items: flex-end; } } diff --git a/bs-ui/src/views/gallery/list/index.vue b/bs-ui/src/views/gallery/list/index.vue index 51fe200..bb3fa68 100644 --- a/bs-ui/src/views/gallery/list/index.vue +++ b/bs-ui/src/views/gallery/list/index.vue @@ -32,7 +32,7 @@
- +
+ @@ -226,11 +227,13 @@ import TableMixin from "@/mixins/table-mixin"; import { pageListByUser } from "@/api/task/branch"; import { addByUser, deleteByUser } from "@/api/task/branch"; import { listUser } from "@/api/system/user"; +// import ImageChooseDialog from "../../gallery/query/components/ImageChooseDialog.vue"; export default { name: "MyTask", components: { AuditDialog, + // ImageChooseDialog }, dicts: ['task_type','task_status'], // 添加字典声明 mixins: [TableMixin], @@ -338,6 +341,9 @@ export default { } catch (error) { this.$message.error('任务撤回失败:' + error.message); } + }, + imageChooseConfirm(list) { + } }, };