Merge branch 'dev-rmd' into develop_Allen

src/layouts/components/Header/ToolBarRight.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="tool-bar-ri">
     <div class="header-icon">
-      <SwitchDark />
-      <AssemblySize id="assemblySize" />
+      <!-- <SwitchDark /> -->
+      <!-- <AssemblySize id="assemblySize" /> -->
       <!-- <Language id="language" /> -->
-      <SearchMenu id="searchMenu" />
-      <ThemeSetting id="themeSetting" />
+      <!-- <SearchMenu id="searchMenu" /> -->
+      <!-- <ThemeSetting id="themeSetting" /> -->
       <!-- <Message id="message" /> -->
       <Fullscreen id="fullscreen" />
     </div>
@@ -17,14 +17,14 @@
 <script setup lang="ts">
 // import { computed } from 'vue'
 // import { useUserStore } from '@/stores/modules/user'
-import AssemblySize from './components/AssemblySize.vue'
+// import AssemblySize from './components/AssemblySize.vue'
 // import Language from './components/Language.vue'
-import SearchMenu from './components/SearchMenu.vue'
-import ThemeSetting from './components/ThemeSetting.vue'
+// import SearchMenu from './components/SearchMenu.vue'
+// import ThemeSetting from './components/ThemeSetting.vue'
 // import Message from './components/Message.vue'
 import Fullscreen from './components/Fullscreen.vue'
 import Avatar from './components/Avatar.vue'
-import SwitchDark from '@/components/SwitchDark/index.vue'
+// import SwitchDark from '@/components/SwitchDark/index.vue'
 
 // const userStore = useUserStore()
 // const username = computed(() => userStore.name || 'KM')

src/stores/modules/global.ts

@@ -7,7 +7,7 @@ export const useGlobalStore = defineStore('admin-global', {
   // 修改默认值之后，需清除 localStorage 数据
   state: (): GlobalState => ({
     // 布局模式 (纵向：vertical | 经典：classic | 横向：transverse | 分栏：columns)
-    layout: 'vertical',
+    layout: 'transverse',
     // element 组件大小
     assemblySize: 'default',
     // 当前系统语言
@@ -39,7 +39,7 @@ export const useGlobalStore = defineStore('admin-global', {
     // 标签页图标
     tabsIcon: true,
     // 页脚
-    footer: true
+    footer: false
   }),
   getters: {},
   actions: {

src/views/ag/model/index.vue

@@ -170,7 +170,8 @@ const setItemsOptions = () => {
       prop: 'modelAddress',
       rules: [{ required: true, message: '模型不能为空', trigger: 'blur' }],
       compOptions: {
-        placeholder: '请输入模型'
+        // placeholder: '请输入模型'
+        elTagName: 'file-upload'
       }
     },
     {

src/views/login/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="login-container flx-center">
     <div class="login-box">
-      <SwitchDark class="dark" />
+      <!-- <SwitchDark class="dark" /> -->
       <div class="login-left">
         <img class="login-left-img" src="@/assets/images/login_left.png" alt="login" />
       </div>
       <div class="login-form">
         <div class="login-logo">
           <img class="login-icon" src="@/assets/images/logo.svg" alt="" />
-          <h2 class="logo-text">KM-Admin</h2>
+          <h2 class="logo-text">算法任务系统</h2>
         </div>
         <LoginForm />
       </div>
@@ -18,7 +18,7 @@
 
 <script setup lang="ts" name="login">
 import LoginForm from './components/LoginForm.vue'
-import SwitchDark from '@/components/SwitchDark/index.vue'
+// import SwitchDark from '@/components/SwitchDark/index.vue'
 </script>
 
 <style scoped lang="scss">

src/views/taais/homePage/createTask.vue

@@ -154,7 +154,6 @@ let formItem = reactive({
   trainDataSelect: [] as any[],
   trainDataEnhancement: {
     algorithmId: null,
-    modelId: null,
     params: []
   },
   trainDataExpansion: {
@@ -438,28 +437,38 @@ let items = reactive<ProForm.ItemsOptions[]>([
       enum: null,
       onChange: val => {
         formItem.trainDataEnhancement.algorithmId = val
-        agloChange('trainEnhanceModel', val)
-      }
-    }
-  },
-  {
-    label: '选择增广模型',
-    prop: 'trainEnhanceModel',
-    span: 14,
-    rules: [{ required: true, message: '选择增广模型' }],
-    show: () => {
-      return pageIndex.value === 3 ? true : false
-    },
-    compOptions: {
-      elTagName: 'select',
-      labelKey: 'modelName',
-      valueKey: 'id',
-      enum: null,
-      onChange: val => {
-        getAgloParams(4, 'trainDataEnhancement', 3, val)
+        // agloChange('trainEnhanceModel', val)
+        // getAgloParams(4, 'trainDataEnhancement', 3, val)
+        getAlgorithmApi(4, subSystem).then(res => {
+          res.data.forEach(item => {
+            if (item.id === val) {
+              const params = eval('(' + item.parameterConfig + ')')
+              formItem['trainDataEnhancement'].params = params
+              addForm(params, 3, 'trainDataEnhancement')
+            }
+          })
+        })
       }
     }
   },
+  // {
+  //   label: '选择增广模型',
+  //   prop: 'trainEnhanceModel',
+  //   span: 14,
+  //   rules: [{ required: true, message: '选择增广模型' }],
+  //   show: () => {
+  //     return pageIndex.value === 3 ? true : false
+  //   },
+  //   compOptions: {
+  //     elTagName: 'select',
+  //     labelKey: 'modelName',
+  //     valueKey: 'id',
+  //     enum: null,
+  //     onChange: val => {
+  //       getAgloParams(4, 'trainDataEnhancement', 3, val)
+  //     }
+  //   }
+  // },
   // 4
   {
     label: '选择扩充算法',

src/views/task/bizProcess/index.vue

@@ -40,13 +40,13 @@
     <el-dialog v-model="resultVisible" title="对比结果" width="70%">
       <div v-if="!resultsFlag" class="resultShow">
         <el-row class="headerRow">
-          <el-col class="col" :span="4" v-for="(agloName, index) in resultsData['agNameList']" :key="index">
+          <el-col class="col" :span="spanNum" v-for="(agloName, index) in resultsData['agNameList']" :key="index">
             <span>{{ agloName }}</span>
           </el-col>
         </el-row>
         <el-row class="row">
-          <el-col class="col" :span="4" v-for="(RCurveUrl, index) in resultsData['rcureList']" :key="index">
-            <div v-if="index !== 1" class="oneCol">{{ RCurveUrl }}</div>
+          <el-col class="col" :span="spanNum" v-for="(RCurveUrl, index) in resultsData['rcureList']" :key="index">
+            <div v-if="index !== 1" :span="4" class="oneCol">{{ RCurveUrl }}</div>
             <ImagePreview
               class="img"
               v-else
@@ -58,7 +58,7 @@
           </el-col>
         </el-row>
         <el-row class="row">
-          <el-col class="col" :span="4" v-for="(PCurveUrl, index) in resultsData['pcureList']" :key="index">
+          <el-col class="col" :span="spanNum" v-for="(PCurveUrl, index) in resultsData['pcureList']" :key="index">
             <div v-if="index !== 1" class="oneCol">{{ PCurveUrl }}</div>
             <ImagePreview
               class="img"
@@ -71,7 +71,7 @@
           </el-col>
         </el-row>
         <el-row class="row">
-          <el-col class="col" :span="4" v-for="(F1CurveUrl, index) in resultsData['f1cureList']" :key="index">
+          <el-col class="col" :span="spanNum" v-for="(F1CurveUrl, index) in resultsData['f1cureList']" :key="index">
             <div v-if="index !== 1" class="oneCol">{{ F1CurveUrl }}</div>
             <ImagePreview
               class="img"
@@ -85,14 +85,15 @@
         </el-row>
       </div>
       <div v-if="resultsFlag" class="resultShow">
-        <el-row class="row">
-          <el-col class="col" :span="4" v-for="(agloName, index) in testResultsData['agNameList']" :key="index">
+        <el-row class="headerRow">
+          <el-col class="col" :span="spanNum" v-for="(agloName, index) in testResultsData['agNameList']" :key="index">
             <span>{{ agloName }}</span>
           </el-col>
         </el-row>
-        <el-row v-for="(item, index) in testResultsData['resultList']" :key="index">
-          <el-col class="col" :span="4" v-for="(url, index1) in item" :key="index1">
-            <span>{{ url }}</span>
+        <el-row class="row" v-for="(item, index) in testResultsData['resultList']" :key="index">
+          <el-col class="col" :span="spanNum" v-for="(url, index1) in item" :key="index1">
+            <!-- <span>{{ url }}</span> -->
+            <ImagePreview class="img" :width="100" :height="100" :src="'/api/profile' + url" :preview-src-list="['/api/profile' + url]" />
           </el-col>
         </el-row>
       </div>
@@ -135,6 +136,7 @@ const resultVisible = ref(false)
 let resultsData = ref({})
 let testResultsData = ref({})
 let resultsFlag = ref(false)
+let spanNum = ref<number>(4)
 let logList = ref()
 let logInfo = ref([] as string[])
 let taskType = ref()
@@ -220,6 +222,8 @@ const contrastResults = () => {
         console.log('333', res)
         resultsFlag.value = true
         testResultsData.value = res.data as any
+        const num = testResultsData.value['agNameList'].length
+        spanNum.value = 24 / num <= 4 ? 4 : parseInt(24 / num)
       })
       break
     default:
@@ -230,6 +234,8 @@ const contrastResults = () => {
 const handleResultData = data => {
   resultsData.value = data
   resultsData.value['agNameList'].unshift('')
+  const num = resultsData.value['agNameList'].length + 1
+  spanNum.value = 24 / num <= 4 ? 4 : parseInt(24 / num)
   resultsData.value['rcureList'].unshift('R_curve')
   resultsData.value['pcureList'].unshift('P_curve')
   resultsData.value['f1cureList'].unshift('F1_curve')