From 3c4327e4dd0e47424c3446beb1e0e1d34fc42a7d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 1 Jun 2024 16:49:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84=E5=AE=A1?=
 =?UTF-8?q?=E3=80=91AI=EF=BC=9A=E7=BB=98=E5=88=B6=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95=E5=92=8C=20review?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ai/image/index.ts                | 16 +++++---
 src/views/ai/image/ImageDetailDrawer.vue | 25 +++++++------
 src/views/ai/image/ImageTask.vue         |  7 ++--
 src/views/ai/image/ImageTaskCard.vue     | 15 +++++---
 src/views/ai/image/dall3/index.vue       | 47 ++++++++++++++----------
 src/views/ai/image/index.vue             |  2 +
 6 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/src/api/ai/image/index.ts b/src/api/ai/image/index.ts
index 72c2dbb1..1df168e5 100644
--- a/src/api/ai/image/index.ts
+++ b/src/api/ai/image/index.ts
@@ -1,10 +1,11 @@
 import request from '@/config/axios'
 
 // AI API 密钥 VO
+// TODO @fan：要不前端不弄太多 VO，就用这个 ImageDetailVO？！
 export interface ImageDetailVO {
   id: number // 编号
   prompt: string // 提示词
-  status: string // 状态
+  status: number // 状态
   errorMessage: string // 错误信息
   type: string // 模型下分不同的类型(清晰、真实...)
   taskId: number // dr 任务id
@@ -31,11 +32,14 @@ export interface ImageDallReqVO {
   height: string // 图片高度
 }
 
-export interface ImageDallReqVO {
+export interface ImageDrawReqVO {
+  platform: string // 平台
   prompt: string // 提示词
   model: string // 模型
   style: string // 图像生成的风格
-  size: string // size不能为空
+  width: string // 图片宽度
+  height: string // 图片高度
+  options: object // 绘制参数，Map<String, String>
 }
 
 export interface ImageMidjourneyImagineReqVO {
@@ -57,9 +61,9 @@ export const ImageApi = {
   getImageDetail: async (id: number) => {
     return await request.get({ url: `/ai/image/get-my?id=${id}`})
   },
-  // dall2、dall3 调用
-  dall: async (data: ImageDallReqVO)=> {
-    return await request.post({ url: `/ai/image/dall`, data })
+  // 生成图片
+  drawImage: async (data: ImageDrawReqVO)=> {
+    return await request.post({ url: `/ai/image/draw`, data })
   },
   // midjourney - imagine
   midjourneyImagine: async (data: ImageMidjourneyImagineReqVO)=> {
diff --git a/src/views/ai/image/ImageDetailDrawer.vue b/src/views/ai/image/ImageDetailDrawer.vue
index b5f09cde..74bde864 100644
--- a/src/views/ai/image/ImageDetailDrawer.vue
+++ b/src/views/ai/image/ImageDetailDrawer.vue
@@ -5,7 +5,7 @@
     @close="handlerDrawerClose"
     custom-class="drawer-class"
   >
-    <!--  图片  -->
+    <!-- 图片 -->
     <div class="item">
 <!--      <div class="header">-->
 <!--        <div>图片</div>-->
@@ -13,6 +13,7 @@
 <!--        </div>-->
 <!--      </div>-->
       <div class="body">
+        <!-- TODO @fan: 要不，这里只展示图片？？？不用 ImageTaskCard -->
         <ImageTaskCard :image-detail="imageDetail" />
       </div>
     </div>
@@ -21,6 +22,7 @@
       <div class="tip">时间</div>
       <div class="body">
         <div>提交时间：{{imageDetail.createTime}}</div>
+        <!-- TODO @fan：要不加个完成时间的字段 finishTime？updateTime 不算特别合理哈 -->
         <div>生成时间：{{imageDetail.updateTime}}</div>
       </div>
     </div>
@@ -38,34 +40,35 @@
         {{imageDetail.prompt}}
       </div>
     </div>
-    <!--  风格  -->
-    <div class="item">
-      <div class="tip">风格</div>
-      <div class="body">
-        {{imageDetail.style}}
-      </div>
-    </div>
     <!--  地址  -->
     <div class="item">
-      <div class="tip">地址</div>
+      <div class="tip">图片地址</div>
       <div class="body">
         {{imageDetail.picUrl}}
       </div>
     </div>
-    <!--  生成地址  -->
+    <!--  生成地址 TODO @fan：这个字段我删除了，要不干掉？ -->
     <div class="item">
       <div class="tip">生成地址</div>
       <div class="body">
         {{imageDetail.originalPicUrl}}
       </div>
     </div>
+    <!-- 风格 -->
+    <div class="item">
+      <div class="tip">风格</div>
+      <div class="body">
+        <!-- TODO @fan：貌似需要把 imageStyleList 搞到 api/image/index.ts 枚举起来？ -->
+        <!-- TODO @fan：这里的展示，可能需要按照平台做区分 -->
+        {{imageDetail.options.style}}
+      </div>
+    </div>
   </el-drawer>
 </template>
 
 <script setup lang="ts">
 import {ImageApi, ImageDetailVO} from '@/api/ai/image';
 import ImageTaskCard from './ImageTaskCard.vue';
-import {Delete, Download, More} from "@element-plus/icons-vue";
 
 const showDrawer = ref<boolean>(false) // 是否显示
 const imageDetail = ref<ImageDetailVO>({} as ImageDetailVO) // 图片详细信息
diff --git a/src/views/ai/image/ImageTask.vue b/src/views/ai/image/ImageTask.vue
index 08ab440b..eacdeba0 100644
--- a/src/views/ai/image/ImageTask.vue
+++ b/src/views/ai/image/ImageTask.vue
@@ -1,4 +1,3 @@
-
 <template>
   <el-card class="dr-task" body-class="task-card" shadow="never">
     <template #header>绘画任务</template>
@@ -19,15 +18,16 @@
 import {ImageApi, ImageDetailVO} from '@/api/ai/image';
 import ImageDetailDrawer from './ImageDetailDrawer.vue'
 import ImageTaskCard from './ImageTaskCard.vue'
-import {bool} from "vue-types";
 
 const message = useMessage() // 消息弹窗
 
 const imageList = ref<ImageDetailVO[]>([]) // image 列表
 const imageListInterval = ref<any>() // image 列表定时器，刷新列表
-const isShowImageDetail = ref<bool>(false) // 是否显示 task 详情
+const isShowImageDetail = ref<boolean>(false) // 是否显示 task 详情
 const showImageDetailId = ref<number>(0) // 是否显示 task 详情
 
+// TODO @fan：如果是简单注释，建议用 /** */，主要是现在项目里是这种风格哈，保持一致好点~
+
 /**
  * 抽屉 - close
  */
@@ -72,6 +72,7 @@ const handlerImageBtnClick = async (type, imageDetail: ImageDetailVO) => {
 /**
  * 下载 - image
  */
+// TODO @fan：貌似可以考虑抽到 download 里面，作为一个方法
 const downloadImage = async (imageUrl) => {
   const image = new Image()
   image.setAttribute('crossOrigin', 'anonymous')
diff --git a/src/views/ai/image/ImageTaskCard.vue b/src/views/ai/image/ImageTaskCard.vue
index c8257c55..8b50734f 100644
--- a/src/views/ai/image/ImageTaskCard.vue
+++ b/src/views/ai/image/ImageTaskCard.vue
@@ -2,10 +2,11 @@
   <el-card body-class="" class="image-card">
     <div class="image-operation">
       <div>
-        <el-button type="" text bg v-if="imageDetail.status === '10'">生成中</el-button>
-        <el-button type="" text bg v-else-if="imageDetail.status === '20'">已完成</el-button>
-        <el-button type="danger" text bg v-else-if="imageDetail.status === '30'">异常</el-button>
+        <el-button type="primary" text bg v-if="imageDetail?.status === 10">生成中</el-button>
+        <el-button text bg v-else-if="imageDetail?.status === 20">已完成</el-button>
+        <el-button type="danger" text bg v-else-if="imageDetail?.status === 30">异常</el-button>
       </div>
+      <!-- TODO @fan：1）按钮要不调整成详情、下载、再次生成、删除？；2）如果是再次生成，就把当前的参数填写到左侧的框框里？ -->
       <div>
         <el-button class="btn" text :icon="Download"
                    @click="handlerBtnClick('download', imageDetail)"/>
@@ -14,8 +15,9 @@
       </div>
     </div>
     <div class="image-wrapper" ref="cardImageRef">
+      <!-- TODO @fan：要不加个点击，大图预览？ -->
       <img class="image" :src="imageDetail?.picUrl"/>
-      <div v-if="imageDetail.status === '30'">{{imageDetail.errorMessage}}</div>
+      <div v-if="imageDetail?.status === 30">{{imageDetail?.errorMessage}}</div>
     </div>
   </el-card>
 </template>
@@ -42,8 +44,9 @@ const handlerBtnClick = async (type, imageDetail: ImageDetailVO) => {
   emits('onBtnClick', type, imageDetail)
 }
 
-const handlerLoading = async (status: string) => {
-  if (status === '10') {
+const handlerLoading = async (status: number) => {
+  // TODO @fan：这个搞成 Loading 组件，然后通过数据驱动，这样搞可以哇？
+  if (status === 10) {
     cardImageLoadingInstance.value = ElLoading.service({
       target: cardImageRef.value,
       text: '生成中...'
diff --git a/src/views/ai/image/dall3/index.vue b/src/views/ai/image/dall3/index.vue
index abeb21a2..e35f86d6 100644
--- a/src/views/ai/image/dall3/index.vue
+++ b/src/views/ai/image/dall3/index.vue
@@ -2,7 +2,8 @@
 <template>
   <div class="prompt">
     <el-text tag="b">画面描述</el-text>
-    <el-text tag="p">建议使用“形容词+动词+风格”的格式，使用“，”隔开.</el-text>
+    <el-text tag="p">建议使用“形容词+动词+风格”的格式，使用“，”隔开</el-text>
+    <!-- TODO @fan：style 看看能不能哟 unocss 替代 -->
     <el-input
       v-model="prompt"
       maxlength="1024"
@@ -32,7 +33,7 @@
   </div>
   <div class="model">
     <div>
-      <el-text tag="b">模型</el-text>
+      <el-text tag="b">模型选择</el-text>
     </div>
     <el-space wrap class="model-list">
       <div
@@ -52,14 +53,13 @@
   </div>
   <div class="image-style">
     <div>
-      <el-text tag="b">样式</el-text>
+      <el-text tag="b">风格选择</el-text>
     </div>
     <el-space wrap class="image-style-list">
       <div
         :class="selectImageStyle === imageStyle ? 'image-style-item selectImageStyle' : 'image-style-item'"
         v-for="imageStyle in imageStyleList"
-        :key="imageStyle"
-
+        :key="imageStyle.key"
       >
         <el-image
           :src="imageStyle.image"
@@ -72,7 +72,7 @@
   </div>
   <div class="image-size">
     <div>
-      <el-text tag="b">尺寸</el-text>
+      <el-text tag="b">画面比例</el-text>
     </div>
     <el-space wrap class="size-list">
       <div class="size-item"
@@ -97,7 +97,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import {ImageApi, ImageDallReqVO} from '@/api/ai/image';
+import {ImageApi, ImageDrawReqVO} from '@/api/ai/image';
 
 // image 模型
 interface ImageModelVO {
@@ -109,6 +109,7 @@ interface ImageModelVO {
 // image 大小
 interface ImageSizeVO {
   key: string
+  name: string,
   style: string,
   width: string,
   height: string,
@@ -120,21 +121,24 @@ const drawIn = ref<boolean>(false)  // 生成中
 const selectHotWord = ref<string>('') // 选中的热词
 const hotWords = ref<string[]>(['中国旗袍', '古装美女', '卡通头像', '机甲战士', '童话小屋', '中国长城'])  // 热词
 const selectModel = ref<any>({}) // 模型
+// TODO @fan：image 改成项目里自己的哈
+// TODO @fan：这个 image，要不看看网上有没合适的图片，作为占位符，啊哈哈
 const models = ref<ImageModelVO[]>([
   {
-    key: 'dall-e-2',
-    name: 'dall2',
-    image: 'https://h5.cxyhub.com/images/model_1.png',
+    key: 'dall-e-3',
+    name: 'DALL·E 3',
+    image: 'https://h5.cxyhub.com/images/model_2.png',
   },
   {
-    key: 'dall-e-3',
-    name: 'dall3',
-    image: 'https://h5.cxyhub.com/images/model_2.png',
+    key: 'dall-e-2',
+    name: 'DALL·E 2',
+    image: 'https://h5.cxyhub.com/images/model_1.png',
   },
 ])  // 模型
 selectModel.value = models.value[0]
 
 const selectImageStyle = ref<any>({}) // style 样式
+// TODO @fan：image 改成项目里自己的哈
 const imageStyleList = ref<ImageModelVO[]>([
   {
     key: 'vivid',
@@ -180,11 +184,13 @@ const props = defineProps({})
 // 定义 emits
 const emits = defineEmits(['onDrawStart', 'onDrawComplete'])
 
+// TODO @fan：如果是简单注释，建议用 /** */，主要是现在项目里是这种风格哈，保持一致好点~
+// TODO @fan：handler 应该改成 handle 哈
 /**
  * 热词 - click
  */
 const handlerHotWordClick = async (hotWord: string) => {
-  // 取消
+  // 取消选中
   if (selectHotWord.value == hotWord) {
     selectHotWord.value = ''
     return
@@ -238,14 +244,17 @@ const handlerGenerateImage = async () => {
     // 回调
     emits('onDrawStart', selectModel.value.key)
     const form = {
+      platform: 'OpenAI',
       prompt: prompt.value, // 提示词
       model: selectModel.value.key, // 模型
-      style: selectImageStyle.value.key, // 图像生成的风格
-      width: selectImageSize.value.width, // size不能为空
-      height: selectImageSize.value.height, // size不能为空
-    } as ImageDallReqVO
+      width: selectImageSize.value.width, // size 不能为空
+      height: selectImageSize.value.height, // size 不能为空
+      options: {
+        style: selectImageStyle.value.key, // 图像生成的风格
+      }
+    } as ImageDrawReqVO
     // 发送请求
-    await ImageApi.dall(form)
+    await ImageApi.drawImage(form)
   } finally {
     // 回调
     emits('onDrawComplete', selectModel.value.key)
diff --git a/src/views/ai/image/index.vue b/src/views/ai/image/index.vue
index f9a9b832..c613d945 100644
--- a/src/views/ai/image/index.vue
+++ b/src/views/ai/image/index.vue
@@ -6,6 +6,7 @@
         <el-segmented v-model="selectModel" :options="modelOptions" />
       </div>
       <div class="modal-switch-container">
+        <!-- TODO @fan：1）建议 Dall3 改成 OpenAI 绘图。因为 dall3 其实本质是模型；2）涉及到中英文的地方，中文和英文之间，有个空格哈 -->
         <Dall3 v-if="selectModel === 'DALL3绘画'"
                @on-draw-start="handlerDrawStart"
                @on-draw-complete="handlerDrawComplete" />
@@ -19,6 +20,7 @@
 </template>
 
 <script setup lang="ts">
+// TODO @fan：在整个挪到 /views/ai/image/index 目录。因为我想在 /views/ai/image/manager 做管理的功能，进行下区分！
 import Dall3 from './dall3/index.vue'
 import Midjourney from './midjourney/index.vue'
 import ImageTask from './ImageTask.vue'