Merge branch 'dev_wk2' into develop

src/views/demo/TargetDetection/index.vue

@@ -159,6 +159,16 @@ import { addAlgorithmModelTrackApi } from '@/api/modules/demo/AlgorithmModelTrac
 import useWebSocketStore from '@/stores/modules/websocket'
 import { resetHeart } from '@/utils/websocket'
 
+import { getDictsApi } from '@/api/modules/system/dictData'
+const zipFileDescDict = ref<any>({})
+onMounted(async () => {
+  const res = await getDictsApi('zip_file_format_description')
+  for (let i = 0; i < res.data.length; i++) {
+    const item = res.data[i]
+    zipFileDescDict.value[item.dictValue] = item.remark
+  }
+})
+
 onMounted(() => {
   const websocketStore = useWebSocketStore()
   websocketStore.websocket.onmessage = (e: any) => {
@@ -280,6 +290,7 @@ const stopTargetDetect = async (params: any) => {
 
 import statusEnums from '@/utils/status'
 import { AlgorithmType, SubSystem, SubSystem__, enumsAlgorithmType, enumsSubSystem } from '@/views/demo/utils'
+import { getDictsApi } from '@/api/modules/system/dictData'
 
 const dowloadTargetDetection = async (params: any) => {
   await useDownload(dowloadTargetDetectionApi, params.name, params.id, true, '.zip')
@@ -590,6 +601,7 @@ const setItemsOptions = () => {
       label: '上传数据集',
       prop: 'inputOssId',
       rules: [{ required: true, message: '数据集不能为空', trigger: 'blur' }],
+      tooltip: zipFileDescDict.value['target_detection'],
       compOptions: {
         elTagName: 'file-upload',
         fileSize: 4096,

src/views/demo/algorithmTaskTrack/index.vue

@@ -71,7 +71,15 @@
             <el-option v-for="item in datasetList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="上传数据集" prop="inputDatasetOssId">
+        <el-form-item prop="inputDatasetOssId">
+          <template #label>
+            <el-space :size="4">
+              <span class="label-span">上传数据集</span>
+              <el-tooltip effect="dark" :content="zipFileDescDict.total_task_dataset" placement="top">
+                <i :class="'iconfont icon-yiwen'"></i>
+              </el-tooltip>
+            </el-space>
+          </template>
           <File ref="fileUploadRef" :file-type="['zip']" :file-size="4096" @update:model-value="fileUploadDatasetChange" />
         </el-form-item>
         <el-form-item label="选择视觉算法" prop="trackSequenceAlgorithmId">
@@ -102,8 +110,22 @@
         <el-form-item label="是否评估" prop="ifEvaluate">
           <el-checkbox v-model="formAddTask.ifEvaluate" />
         </el-form-item>
-        <el-form-item label="上传真实标签" prop="inputEvaluateLabelOssId" v-show="formAddTask.ifEvaluate">
-          <File ref="fileUploadEvaluateLabelRef" :model-value="formAddTask.inputEvaluateLabelOssId" :file-type="['txt']" :file-size="4096" @update:model-value="fileUploadChangeEvaluateLabel" />
+        <el-form-item prop="inputEvaluateLabelOssId" v-show="formAddTask.ifEvaluate">
+          <template #label>
+            <el-space :size="4">
+              <span class="label-span">上传真实标签</span>
+              <el-tooltip effect="dark" :content="zipFileDescDict.total_task_label" placement="top">
+                <i :class="'iconfont icon-yiwen'"></i>
+              </el-tooltip>
+            </el-space>
+          </template>
+          <File
+            ref="fileUploadEvaluateLabelRef"
+            :model-value="formAddTask.inputEvaluateLabelOssId"
+            :file-type="['txt']"
+            :file-size="4096"
+            @update:model-value="fileUploadChangeEvaluateLabel"
+          />
         </el-form-item>
         <el-form-item label="选择视觉评估算法" prop="trackSequenceEvaluateAlgorithmId" v-show="formAddTask.ifEvaluate">
           <div class="form-item1">
@@ -328,6 +350,17 @@ import ShowStatisticResult from '@/views/demo/components/ShowStatisticResult.vue
 import useWebSocketStore from '@/stores/modules/websocket'
 import { resetHeart } from '@/utils/websocket'
 
+import { getDictsApi } from '@/api/modules/system/dictData'
+
+const zipFileDescDict = ref<any>({})
+onMounted(async () => {
+  const res = await getDictsApi('zip_file_format_description')
+  for (let i = 0; i < res.data.length; i++) {
+    const item = res.data[i]
+    zipFileDescDict.value[item.dictValue] = item.remark
+  }
+})
+
 onMounted(() => {
   const websocketStore = useWebSocketStore()
   websocketStore.websocket.onmessage = (e: any) => {
@@ -936,7 +969,7 @@ const getItemsOptions = async (algorithmId: any) => {
         // 添加新的表单项选项
         itemsOptions_new.push({
           label: item['name'],
-          labelWidth: "200px",
+          labelWidth: '200px',
           prop: item['agName'],
           rules: [{ required: item['required'], message: item['agName'] + '不能为空', trigger: 'blur' }],
           tooltip: item['prompt'],

src/views/demo/toInfrared/index.vue

@@ -24,7 +24,7 @@
       </template>
       <!-- 表格操作 -->
       <template #operation="scope">
-        <el-button type="primary" link icon="View" @click="openDialog(3, '详情', scope.row)"> 详情 </el-button>
+        <el-button type="primary" link icon="View" @click="openDialog(3, '详情', scope.row)"> 详情</el-button>
         <el-button type="primary" link icon="EditPen" v-auth="['demo:toInfrared:edit']" @click="openDialog(2, '编辑', scope.row)"> 编辑 </el-button>
         <el-button
           type="primary"
@@ -170,6 +170,7 @@ import {
 } from '@/api/modules/demo/toInfrared'
 
 import { getImagesApi, listDataSeqApi } from '@/api/modules/demo/DataSeq'
+import { getDictsApi } from '@/api/modules/system/dictData'
 
 import { enumAlgorithmModelTrackApi, addAlgorithmModelTrackApi, getAlgorithmModelTrackApi } from '@/api/modules/demo/AlgorithmModelTrack'
 import { enumAlgorithmConfigTrackApi, getAlgorithmConfigTrackApi } from '@/api/modules/demo/AlgorithmConfigTrack'
@@ -180,8 +181,18 @@ import ViewLog from '@/views/demo/components/ViewLog.vue'
 import useWebSocketStore from '@/stores/modules/websocket'
 import { resetHeart } from '@/utils/websocket'
 import ShowStatisticResult from '@/views/demo/components/ShowStatisticResult.vue'
+
 const showStatisticResultRef = ref()
 
+const zipFileDescDict = ref<any>({})
+onMounted(async () => {
+  const res = await getDictsApi('zip_file_format_description')
+  for (let i = 0; i < res.data.length; i++) {
+    const item = res.data[i]
+    zipFileDescDict.value[item.dictValue] = item.remark
+  }
+})
+
 onMounted(() => {
   const websocketStore = useWebSocketStore()
   websocketStore.websocket.onmessage = (e: any) => {
@@ -610,6 +621,7 @@ const setItemsOptions = () => {
       label: '上传数据集',
       prop: 'inputOssId',
       rules: [{ required: false, message: '数据集不能为空', trigger: 'blur' }],
+      tooltip: zipFileDescDict.value['to_infrared'],
       compOptions: {
         elTagName: 'file-upload',
         fileSize: 4096,

src/views/demo/trackSequence/index.vue

@@ -210,6 +210,16 @@ import PreviewCompareImages from '@/views/demo/components/PreviewCompareImages.v
 import ShowStatisticResult from '@/views/demo/components/ShowStatisticResult.vue'
 import { getTargetDetectionApi } from '@/api/modules/demo/TargetDetection'
 
+import { getDictsApi } from '@/api/modules/system/dictData'
+const zipFileDescDict = ref<any>({})
+onMounted(async () => {
+  const res = await getDictsApi('zip_file_format_description')
+  for (let i = 0; i < res.data.length; i++) {
+    const item = res.data[i]
+    zipFileDescDict.value[item.dictValue] = item.remark
+  }
+})
+
 const showStatisticResultRef = ref()
 const showEvaluateResultRef = ref()
 
@@ -352,6 +362,7 @@ const setItemsOptionsAddCAT = () => {
       label: '上传数据集',
       prop: 'inputOssId',
       rules: [{ required: false, message: '数据集不能为空', trigger: 'blur' }],
+      tooltip: zipFileDescDict.value['track_sequence'],
       compOptions: {
         elTagName: 'file-upload',
         fileSize: 4096,
@@ -451,7 +462,7 @@ const showEvaluate = (row: any) => {
       }
     },
     {
-      label: "上传Label文件",
+      label: '上传Label文件',
       prop: 'inputLabelOssId',
       rules: [{ required: false, message: '请上传Label文件', trigger: 'blur' }],
       compOptions: {
@@ -773,6 +784,7 @@ const setItemsOptions = () => {
       label: '上传数据集',
       prop: 'inputOssId',
       rules: [{ required: false, message: '数据集不能为空', trigger: 'blur' }],
+      tooltip: zipFileDescDict.value['track_sequence'],
       compOptions: {
         elTagName: 'file-upload',
         fileSize: 4096,
@@ -860,6 +872,7 @@ const setItemsOptions = () => {
       label: '上传标签',
       prop: 'inputLabelOssId',
       rules: [{ required: true, message: '标签不能为空', trigger: 'blur' }],
+      tooltip: zipFileDescDict.value['track_sequence_label'],
       show: params => {
         if (params.value.type == AlgorithmType2['测试']) {
           return true