Browse Source

feat: 暂存

Rmengdi 1 year ago
parent
commit
6fc668c263

+ 9 - 1
src/api/modules/taais/task.ts

@@ -39,7 +39,15 @@ export const getImageApi = (type: any) => {
 export const createTaskApi = (data: any) => {
   return http.post<any>(`/task/task/create`, data)
 }
-
+/**
+ * @name 算法查询
+ * @param data data
+ * @returns returns
+ */
+export const getAlgorithmApi = (type: any, subsystem: any) => {
+  return http.post<any>(`/task/task/getAlgorithm/${type}/${subsystem}`)
+  // return http.post<any>(`/task/task/getModel`, data)
+}
 /**
  * @name 模型查询
  * @param data data

+ 0 - 4
src/views/ag/config/index.vue

@@ -156,10 +156,6 @@ const setItemsOptions = () => {
       label: '类型',
       prop: 'type',
       rules: [{ required: true, message: '类型不能为空', trigger: 'change' }],
-      options: {
-        labelKey: 'dictLabel',
-        valueKey: 'dictValue'
-      },
       compOptions: {
         elTagName: 'radio-group',
         labelKey: 'dictLabel',

+ 73 - 49
src/views/taais/homePage/createTask.vue

@@ -25,36 +25,28 @@
               />
             </template>
             <template #proTable="{}">
-              <el-tabs tab-position="left" style="min-height: 450px" class="demo-tabs">
-                <el-tab-pane label="数据一">
+              <el-tabs tab-position="left" v-model="activeName" style="min-height: 450px" class="demo-tabs">
+                <el-tab-pane label="数据一" name="one">
                   <div class="table-box">
-                    <ProTable
-                      ref="proTable1"
-                      row-key="id"
-                      :columns="dataColumns"
-                      :request-api="listDataApi"
-                      :init-param="initParam"
-                      :tool-button="false"
-                      height="45vh"
-                    >
+                    <ProTable ref="proTable1" row-key="id" :columns="dataColumns" :request-api="listDataApi" :tool-button="false" height="45vh">
                     </ProTable>
                   </div>
                 </el-tab-pane>
-                <el-tab-pane label="数据二">
+                <el-tab-pane label="数据二" name="two">
                   <div class="table-box">
-                    <ProTable ref="proTable1" row-key="id" :columns="dataColumns" :request-api="listDataApi" :tool-button="false" height="45vh">
+                    <ProTable ref="proTable2" row-key="id" :columns="dataColumns" :request-api="listDataApi" :tool-button="false" height="45vh">
                     </ProTable>
                   </div>
                 </el-tab-pane>
-                <el-tab-pane label="数据三">
+                <el-tab-pane label="数据三" name="three">
                   <div class="table-box">
-                    <ProTable ref="proTable1" row-key="id" :columns="dataColumns" :request-api="listDataApi" :tool-button="false" height="45vh">
+                    <ProTable ref="proTable3" row-key="id" :columns="dataColumns" :request-api="listDataApi" :tool-button="false" height="45vh">
                     </ProTable>
                   </div>
                 </el-tab-pane>
-                <el-tab-pane label="数据四">
+                <el-tab-pane label="数据四" name="four">
                   <div class="table-box">
-                    <ProTable ref="proTable1" row-key="id" :columns="dataColumns" :request-api="listDataApi" :tool-button="false" height="45vh">
+                    <ProTable ref="proTable4" row-key="id" :columns="dataColumns" :request-api="listDataApi" :tool-button="false" height="45vh">
                     </ProTable>
                   </div>
                 </el-tab-pane>
@@ -87,16 +79,14 @@
 import { ref, ComputedRef, computed, watch, reactive } from 'vue'
 import ProForm from '@/components/ProForm/index.vue'
 import { useRouter } from 'vue-router'
-import { getModelApi } from '@/api/modules/taais/task'
+import { getModelApi, getAlgorithmApi } from '@/api/modules/taais/task'
 import ProTable from '@/components/ProTable/index.vue'
 import { ColumnProps, ProTableInstance } from '@/components/ProTable/interface'
 import { listDataApi } from '@/api/modules/demo/data'
 import { ElMessage, ElTree } from 'element-plus'
 import { getDictsApi } from '@/api/modules/system/dictData'
 // :request-api="getImageApi(1)" getImageApi,
-const initParam = reactive({
-  type: 1
-})
+const activeName = ref('one')
 let model = ref({
   taskType: '1',
   enhanceModel: '',
@@ -120,9 +110,13 @@ let formItem = reactive({
 })
 let prevTreeData = ref([3])
 const router = useRouter()
+// let trainSubSystem = 0
 let pageIndex = ref<number>(1)
 const selectTaskTreeRef = ref<InstanceType<typeof ElTree>>()
 const proTable1 = ref<ProTableInstance>()
+const proTable2 = ref<ProTableInstance>()
+const proTable3 = ref<ProTableInstance>()
+const proTable4 = ref<ProTableInstance>()
 let title = ref('目标精准捕获任务选择')
 let nextBtnText = ref('下一步')
 const enumData = [
@@ -299,24 +293,6 @@ const dataColumns = reactive<ColumnProps<any>[]>([
     width: 120
   }
 ])
-// const dataOne = getModelApi(1)
-// const dataOne = listDataApi({
-//   type: 1,
-//   pageNum: 1,
-//   pageSize: 10
-// })
-// const dataOne = getModelApi({
-//   algorithmId: 1
-// })
-let subsystemData = []
-getDictsApi('biz_algorithm_config').then((res: any) => {
-  console.log('res', res)
-
-  // subsystemData = res.data
-})
-console.log('subsystemData.value', subsystemData)
-
-// console.log('dataOne', dataOne)
 const defaultProps = {
   children: 'children',
   label: 'label'
@@ -331,7 +307,8 @@ const _options: ComputedRef<ProForm.FormOptions> = computed(() => {
   return Object.assign(form)
 })
 
-let items: ProForm.ItemsOptions[] = [
+let items = reactive<ProForm.ItemsOptions[]>([
+  // 1
   {
     label: '任务名称',
     prop: 'taskName',
@@ -367,6 +344,7 @@ let items: ProForm.ItemsOptions[] = [
       enum: taskTypeData
     }
   },
+  // 2  6  10
   {
     label: '',
     hideLabelSuffix: true,
@@ -379,6 +357,7 @@ let items: ProForm.ItemsOptions[] = [
       elTagName: 'slot'
     }
   },
+  // 3
   {
     label: '选择增强算法',
     prop: 'trainEnhanceAlgo',
@@ -401,6 +380,7 @@ let items: ProForm.ItemsOptions[] = [
       }
     }
   },
+  // 4
   {
     label: '选择扩充算法',
     prop: 'trainExpansionAlgo',
@@ -423,6 +403,29 @@ let items: ProForm.ItemsOptions[] = [
       }
     }
   },
+  // 5
+  {
+    label: '选择子系统',
+    prop: 'trainSubConfig',
+    span: 14,
+    rules: [{ required: true, message: '请选择子系统' }],
+    show: () => {
+      return pageIndex.value === 5 ? true : false
+    },
+    compOptions: {
+      elTagName: 'select',
+      labelKey: 'dictLabel',
+      valueKey: 'dictValue',
+      enum: () => getDictsApi('biz_sub_config'),
+      onChange: val => {
+        // trainSubSystem = val
+        getAlgorithmApi(1, val).then(res => {
+          console.log('res', res)
+          formItems.value[0].items[7].compOptions.enum = res.data as any[]
+        })
+      }
+    }
+  },
   {
     label: '选择训练算法',
     prop: 'trainAlgo',
@@ -433,10 +436,17 @@ let items: ProForm.ItemsOptions[] = [
     },
     compOptions: {
       elTagName: 'select',
-      enum: enumData,
+      labelKey: 'algorithmName',
+      valueKey: 'id',
+      enum: null,
+      // enum: enumData,
       onChange: val => {
         // console.log("val5",val);
         formItem.train[0]['algorithmId'] = val
+        getModelApi(val).then(res => {
+          console.log('res', res)
+          formItems.value[0].items[8].compOptions.enum = res.data as any[]
+        })
       }
     }
   },
@@ -450,8 +460,15 @@ let items: ProForm.ItemsOptions[] = [
     },
     compOptions: {
       elTagName: 'select',
-      enum: subsystemData,
+      labelKey: 'modelName',
+      valueKey: 'id',
+      // enum: () => getModelApi(1),
+      enum: null,
       onChange: val => {
+        // getModelApi(val).then(res => {
+        //   console.log('res', res)
+        //   formItems.value[0].items[8].compOptions.enum = res.data as any[]
+        // })
         const params = [
           { name: 'ccc', value: 'bbb', defaultValue: 'xxx', required: true, index: 1 },
           { name: 'ccc1', value: 'bbb2', defaultValue: 'xxx3', required: false, index: 4 }
@@ -463,6 +480,7 @@ let items: ProForm.ItemsOptions[] = [
       }
     }
   },
+  // 7
   {
     label: '选择增强算法',
     prop: 'testEnhanceAlgo',
@@ -497,6 +515,7 @@ let items: ProForm.ItemsOptions[] = [
       }
     }
   },
+  // 8
   {
     label: '选择扩充算法',
     prop: 'testExpansionAlgo',
@@ -531,6 +550,7 @@ let items: ProForm.ItemsOptions[] = [
       }
     }
   },
+  // 9
   {
     label: '选择测试算法',
     prop: 'testAlgo',
@@ -571,6 +591,7 @@ let items: ProForm.ItemsOptions[] = [
       }
     }
   },
+  // 11
   {
     label: '选择增强算法',
     prop: 'reasoningEnhanceAlgo',
@@ -605,6 +626,7 @@ let items: ProForm.ItemsOptions[] = [
       }
     }
   },
+  // 12
   {
     label: '选择扩充算法',
     prop: 'reasoningExpansionAlgo',
@@ -639,6 +661,7 @@ let items: ProForm.ItemsOptions[] = [
       }
     }
   },
+  // 13
   {
     label: '选择测试算法',
     prop: 'reasoningAlgo',
@@ -679,7 +702,7 @@ let items: ProForm.ItemsOptions[] = [
       }
     }
   }
-]
+])
 // let formItemsTemp4 = ref([
 //   {
 //     items,
@@ -813,12 +836,12 @@ const onNext = () => {
       }
       if (pageIndex.value === 2) {
         for (let i = 0; i <= 3; i++) {
-          if (Object.keys(proTable1.value![i].searchParam).length !== 0) {
-            formItem.trainDataSelect.push({
-              conditionSelected: true,
-              condition: proTable1.value![i].searchParam
-            })
-          }
+          // if (Object.keys(proTable1.value![i].searchParam).length !== 0) {
+          //   formItem.trainDataSelect.push({
+          //     conditionSelected: true,
+          //     condition: proTable1.value![i].searchParam
+          //   })
+          // }
         }
         console.log('formItem.trainDataSelect', formItem.trainDataSelect)
       }
@@ -830,6 +853,7 @@ const onNext = () => {
         return
         // router.push({ path: `/logPage/${flag.value}`, query: { type: 1 } })
       }
+
       pageIndex.value = formItem.selectTask[formItem.selectTask.findIndex(page => page === pageIndex.value) + 1]
     }
   })