feat: 可见光转红外 训练、预测接口对接完成

src/views/demo/components/PreviewImages.vue

@@ -26,7 +26,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="跳转至">
-        <el-input v-model="newImageIdx" type="number" style="width: 100px"/>
+        <el-input v-model="newImageIdx" type="number" style="width: 100px" />
         <el-button type="primary" @click="confirmNewImageIdx" style="margin-left: 10px">确认</el-button>
       </el-form-item>
     </el-form>
@@ -41,8 +41,8 @@
 </template>
 
 <script setup lang="ts">
-import {ElMessageBox} from "element-plus";
-import {ref, watch} from "vue";
+import { ElMessageBox } from 'element-plus'
+import { ref, watch } from 'vue'
 
 const props = defineProps({
   visible: {
@@ -51,13 +51,16 @@ const props = defineProps({
   },
   urls: {
     type: Array,
-    default: ()=>[]
+    default: () => []
   }
 })
 
-watch(() => props.visible, (val) => {
-  dialogVisible.value = val
-})
+watch(
+  () => props.visible,
+  val => {
+    dialogVisible.value = val
+  }
+)
 
 const handleOpen = () => {
   currentImageUrls.value = props.urls
@@ -105,7 +108,7 @@ const changeFps = () => {
 }
 
 const next_picture = () => {
-  if (imageIdx.value <= currentImageUrls.value.length - 1) {
+  if (imageIdx.value < currentImageUrls.value.length - 1) {
     imageIdx.value += 1
   }
 }
@@ -121,13 +124,11 @@ const pre_picture = () => {
 .image-dialog {
   display: flex;
   justify-content: center;
-
   .el-image {
     margin-right: 20px;
     margin-bottom: 20px;
   }
 }
-
 .image-dialog-btn {
   display: flex;
   justify-content: center;

src/views/demo/toInfrared/index.vue

@@ -3,9 +3,7 @@
     <ProTable ref="proTable" :columns="columns" row-key="id" :request-api="listToInfraredApi">
       <!-- 表格 header 按钮 -->
       <template #tableHeader="scope">
-        <el-button type="primary" v-auth="['demo:toInfrared:add']" icon="CirclePlus" @click="openDialog(1, '可见光转红外新增')">
-          新增
-        </el-button>
+        <el-button type="primary" v-auth="['demo:toInfrared:add']" icon="CirclePlus" @click="openDialog(1, '可见光转红外新增')"> 新增 </el-button>
         <!-- <el-button type="primary" v-auth="['demo:toInfrared:import']" icon="Upload" plain @click="batchAdd"> 导入 </el-button>
         <el-button type="primary" v-auth="['demo:toInfrared:export']" icon="Download" plain @click="downloadFile"> 导出 </el-button> -->
         <el-button
@@ -41,8 +39,14 @@
             <el-button type="primary" link icon="Delete"> 终止</el-button>
           </template>
         </el-popconfirm>
-        <el-button type="primary" link icon="View" v-auth="['demo:DataSeq:query']" v-if="scope.row.status == '2'"
-                   @click="preview(scope.row)">
+        <el-button
+          type="primary"
+          link
+          icon="View"
+          v-auth="['demo:DataSeq:query']"
+          v-if="scope.row.status == '2' && scope.row.type == AlgorithmType2['预测/推理']"
+          @click="preview(scope.row)"
+        >
           预览
         </el-button>
         <el-button
@@ -69,21 +73,21 @@
         </el-button>
       </template>
     </ProTable>
-    <FormDialog ref="formDialogRef"/>
-    <ImportExcel ref="dialogRef"/>
-    <PreviewImages :visible="dialogVisible" :urls="imageUrls" @close="dialogVisible = false"/>
+    <FormDialog ref="formDialogRef" />
+    <ImportExcel ref="dialogRef" />
+    <PreviewImages :visible="dialogVisible" :urls="imageUrls" @close="dialogVisible = false" />
   </div>
 </template>
 
 <script setup lang="tsx" name="ToInfrared">
-import {ref, reactive, onMounted} from 'vue'
-import {useHandleData} from '@/hooks/useHandleData'
-import {useDownload} from '@/hooks/useDownload'
-import {ElMessage, ElMessageBox} from 'element-plus'
+import { ref, reactive, onMounted } from 'vue'
+import { useHandleData } from '@/hooks/useHandleData'
+import { useDownload } from '@/hooks/useDownload'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import ProTable from '@/components/ProTable/index.vue'
 import ImportExcel from '@/components/ImportExcel/index.vue'
 import FormDialog from '@/components/FormDialog/index.vue'
-import {ProTableInstance, ColumnProps} from '@/components/ProTable/interface'
+import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
 import {
   listToInfraredApi,
   delToInfraredApi,
@@ -98,20 +102,21 @@ import {
   getToInfraredApi
 } from '@/api/modules/demo/toInfrared'
 
-import {getImagesApi, listDataSeqApi} from '@/api/modules/demo/DataSeq'
+import { getImagesApi, listDataSeqApi } from '@/api/modules/demo/DataSeq'
 
-import {enumAlgorithmModelTrackApi} from '@/api/modules/demo/AlgorithmModelTrack'
-import {getAlgorithmModelTrackApi} from '@/api/modules/demo/AlgorithmModelTrack'
-import {enumAlgorithmConfigTrackApi} from '@/api/modules/demo/AlgorithmConfigTrack'
+import { enumAlgorithmModelTrackApi } from '@/api/modules/demo/AlgorithmModelTrack'
+import { getAlgorithmModelTrackApi } from '@/api/modules/demo/AlgorithmModelTrack'
+import { enumAlgorithmConfigTrackApi } from '@/api/modules/demo/AlgorithmConfigTrack'
 import statusEnums from '@/utils/status'
-import {AlgorithmType, SubSystem, SubSystem__, enumsAlgorithmType, enumsSubSystem} from '@/views/demo/utils'
-import PreviewImages from "@/views/demo/components/PreviewImages.vue";
+import { AlgorithmType, SubSystem, SubSystem__, enumsAlgorithmType, enumsSubSystem, AlgorithmType2 } from '@/views/demo/utils'
+import PreviewImages from '@/views/demo/components/PreviewImages.vue'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 
 const dialogVisible = ref(false)
 const imageUrls = ref([])
-const preview = async (row) => {
-  console.log("showImages:", row.inputOssId)
-  const data: any = await getImagesApi(row.inputOssId, "_to_infrared", false, "img")
+const preview = async row => {
+  console.log('showImages:', row.inputOssId)
+  const data: any = await getImagesApi(row.inputOssId, '_to_infrared', false, 'predict')
   imageUrls.value = data.data
   dialogVisible.value = true
 }
@@ -158,7 +163,7 @@ const dowloadToInfrared = async (params: any) => {
 }
 
 const openStartDialog = async (row: any) => {
-  let res = {data: {}}
+  let res = { data: {} }
   if (row?.id) {
     res = await getToInfraredApi(row?.id || null)
   }
@@ -194,7 +199,7 @@ const batchDelete = async (ids: string[]) => {
 
 // 导出可见光转红外列表
 const downloadFile = async () => {
-  ElMessageBox.confirm('确认导出可见光转红外数据?', '温馨提示', {type: 'warning'}).then(() =>
+  ElMessageBox.confirm('确认导出可见光转红外数据?', '温馨提示', { type: 'warning' }).then(() =>
     useDownload(exportToInfraredApi, '可见光转红外列表', proTable.value?.searchParam)
   )
 }
@@ -214,7 +219,7 @@ const batchAdd = () => {
 const formDialogRef = ref<InstanceType<typeof FormDialog> | null>(null)
 // 打开弹框的功能
 const openDialog = async (type: number, title: string, row?: any) => {
-  let res = {data: {}}
+  let res = { data: {} }
   if (row?.id) {
     res = await getToInfraredApi(row?.id || null)
   }
@@ -234,8 +239,8 @@ const openDialog = async (type: number, title: string, row?: any) => {
 
 // 表格配置项
 const columns = reactive<ColumnProps<any>[]>([
-  {type: 'selection', fixed: 'left', width: 70},
-  {prop: 'id', label: '主键ID', width: 180},
+  { type: 'selection', fixed: 'left', width: 70 },
+  { prop: 'id', label: '主键ID', width: 180 },
   {
     prop: 'name',
     label: '任务名称',
@@ -319,7 +324,7 @@ const columns = reactive<ColumnProps<any>[]>([
     },
     width: 120
   },
-  {prop: 'operation', label: '操作', width: 230, fixed: 'right'}
+  { prop: 'operation', label: '操作', width: 230, fixed: 'right' }
 ])
 // 表单配置项
 let itemsOptions: ProForm.ItemsOptions[] = []
@@ -328,7 +333,7 @@ const setItemsOptions = () => {
     {
       label: '任务名称',
       prop: 'name',
-      rules: [{required: true, message: '任务名称不能为空', trigger: 'blur'}],
+      rules: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
       compOptions: {
         placeholder: '请输入任务名称'
       }
@@ -336,7 +341,7 @@ const setItemsOptions = () => {
     {
       label: '选择数据集',
       prop: 'inputOssId',
-      rules: [{required: false, message: '数据集不能为空', trigger: 'blur'}],
+      rules: [{ required: false, message: '数据集不能为空', trigger: 'blur' }],
       compOptions: {
         elTagName: 'select',
         placeholder: '请选择或者上传数据集',
@@ -347,7 +352,7 @@ const setItemsOptions = () => {
     {
       label: '上传数据集',
       prop: 'inputOssId',
-      rules: [{required: false, message: '数据集不能为空', trigger: 'blur'}],
+      rules: [{ required: false, message: '数据集不能为空', trigger: 'blur' }],
       compOptions: {
         elTagName: 'file-upload',
         fileSize: 4096,
@@ -358,7 +363,7 @@ const setItemsOptions = () => {
     {
       label: '选择模型',
       prop: 'algorithmModelId',
-      rules: [{required: true, message: '模型不能为空', trigger: 'blur'}],
+      rules: [{ required: true, message: '模型不能为空', trigger: 'blur' }],
       compOptions: {
         elTagName: 'select',
         placeholder: '请选择模型',
@@ -412,7 +417,7 @@ const setItemsOptions2 = () => {
     {
       label: '任务名称',
       prop: 'name',
-      rules: [{required: true, message: '任务名称不能为空', trigger: 'blur'}],
+      rules: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
       compOptions: {
         disabled: true,
         placeholder: '请输入任务名称'
@@ -421,7 +426,7 @@ const setItemsOptions2 = () => {
     {
       label: '选择模型',
       prop: 'algorithmModel',
-      rules: [{required: true, message: '模型不能为空', trigger: 'blur'}],
+      rules: [{ required: true, message: '模型不能为空', trigger: 'blur' }],
       compOptions: {
         elTagName: 'select',
         placeholder: '请选择模型',
@@ -454,7 +459,7 @@ const setItemsOptionsModel = () => {
     {
       label: '算法ID',
       prop: 'algorithmId',
-      rules: [{required: true, message: '算法不能为空', trigger: 'blur'}],
+      rules: [{ required: true, message: '算法不能为空', trigger: 'blur' }],
       compOptions: {
         disabled: true,
         placeholder: '请输入算法'
@@ -463,7 +468,7 @@ const setItemsOptionsModel = () => {
     {
       label: '算法类型',
       prop: 'algorithmType',
-      rules: [{required: true, message: '算法不能为空', trigger: 'blur'}],
+      rules: [{ required: true, message: '算法不能为空', trigger: 'blur' }],
       compOptions: {
         disabled: true,
         elTagName: 'select',
@@ -474,7 +479,7 @@ const setItemsOptionsModel = () => {
     {
       label: '算法参数',
       prop: 'parameterConfig',
-      rules: [{required: true, message: '模型名称不能为空', trigger: 'blur'}],
+      rules: [{ required: true, message: '模型名称不能为空', trigger: 'blur' }],
       compOptions: {
         placeholder: '请输入模型名称'
       }
@@ -482,7 +487,7 @@ const setItemsOptionsModel = () => {
     {
       label: '模型ID',
       prop: 'id',
-      rules: [{required: true, message: '模型名称不能为空', trigger: 'blur'}],
+      rules: [{ required: true, message: '模型名称不能为空', trigger: 'blur' }],
       compOptions: {
         placeholder: '请输入模型名称'
       }
@@ -490,7 +495,7 @@ const setItemsOptionsModel = () => {
     {
       label: '模型名称',
       prop: 'modelName',
-      rules: [{required: true, message: '模型名称不能为空', trigger: 'blur'}],
+      rules: [{ required: true, message: '模型名称不能为空', trigger: 'blur' }],
       compOptions: {
         placeholder: '请输入模型名称'
       }
@@ -498,7 +503,7 @@ const setItemsOptionsModel = () => {
     {
       label: '模型保存路径',
       prop: 'modelAddress',
-      rules: [{required: true, message: '模型名称不能为空', trigger: 'blur'}],
+      rules: [{ required: true, message: '模型名称不能为空', trigger: 'blur' }],
       compOptions: {
         placeholder: '请输入模型名称'
       }
@@ -506,7 +511,7 @@ const setItemsOptionsModel = () => {
     {
       label: '备注',
       prop: 'remarks',
-      rules: [{required: false, message: '备注不能为空', trigger: 'blur'}],
+      rules: [{ required: false, message: '备注不能为空', trigger: 'blur' }],
       compOptions: {
         placeholder: '请输入备注'
       }

src/views/demo/utils.ts

@@ -26,6 +26,12 @@ export const SubSystem__ = {
   注释轨迹序列: '2'
 }
 
+export const AlgorithmType2 = {
+  训练: '0',
+  测试: '1',
+  '预测/推理': '2'
+}
+
 export const enumsAlgorithmType = [
   { label: '训练', value: '0' },
   { label: '测试', value: '1' },