Jelajahi Sumber

update:configDetail一些改动

Yan 4 tahun lalu
induk
melakukan
8cde5eb48f
4 mengubah file dengan 42 tambahan dan 30 penghapusan
  1. 11 11
      src/components/Sidebar.vue
  2. 21 15
      src/views/ConfigDetail.vue
  3. 3 2
      src/views/ConfigList.vue
  4. 7 2
      src/views/ModelList.vue

+ 11 - 11
src/components/Sidebar.vue

@@ -88,17 +88,17 @@ export default {
             title: "训练结果",
           },
 
-          {
-            icon: "el-icon-lx-redpacket_fill",
-            index: "/modelList",
-            title:"深度学习",
-          },
-
-          {
-              icon: "el-icon-lx-copy",
-              index: "/message",
-              title: "我的消息",
-          },
+          // {
+          //   icon: "el-icon-lx-redpacket_fill",
+          //   index: "/modelList",
+          //   title:"深度学习",
+          // },
+          //
+          // {
+          //     icon: "el-icon-lx-copy",
+          //     index: "/message",
+          //     title: "我的消息",
+          // },
           {
               icon: "el-icon-user",
               index: "/user",

+ 21 - 15
src/views/ConfigDetail.vue

@@ -28,8 +28,8 @@
               {{}}
             </el-form-item>
             <el-form-item label="特征字段:" >
-              <el-table :data="tableData" border class="table" ref="fieldTable" header-cell-class-name="table-header" @selection-change="handleSelectChange">
-                <el-table-column label="字段名">
+              <el-table :data="tableData" border class="table"  ref="fieldTable" header-cell-class-name="table-header" @selection-change="handleSelectChange">
+                <el-table-column label="字段名" width="120%">
                   <template #default="scope"><span>{{ scope.row.fieldName }}</span></template>
                 </el-table-column>
                 <el-table-column label="别名">
@@ -48,7 +48,7 @@
                   <template #default="scope">{{ scope.row.nullsRatio }}</template>
                 </el-table-column>
 
-                <el-table-column label="值域" >
+                <el-table-column label="值域" width="150%">
                   <template #default="scope">{{ scope.row.valueInfo }}</template>
                 </el-table-column>
               </el-table>
@@ -56,20 +56,22 @@
 
             <el-form-item label="模型列表:" >
             <el-table :data="modelData" border class="table" ref="fieldTable" header-cell-class-name="table-header" @selection-change="handleSelectChange">
-              <el-table-column label="模型名">
+              <el-table-column label="模型名" width="150%">
                 <template #default="scope"><span>{{ scope.row.modelName }}</span></template>
               </el-table-column>
-              <el-table-column label="详情">
+              <el-table-column label="模型类别" width="150%">
                 <template #default="scope">{{ scope.row.modelDetailName }}</template>
               </el-table-column>
               <el-table-column label="训练状态">
-                <template #default="scope">{{ scope.row.trainedStatus}}</template>
+                <template #default="scope" >
+                  <div v-if="scope.row.trainedStatus===-1">未训练</div>
+                  <div v-else="">已训练</div></template>
               </el-table-column>
               <el-table-column label="操作" width="180" align="center">
                 <template #default="scope">
 
                   <router-link :to="{path:'/ModelDetail',query:{modelId:scope.row.id}}">
-                    <el-button type="text" icon="el-icon-edit" >查看模型
+                    <el-button type="text" icon="el-icon-view" >查看模型
                     </el-button>
                   </router-link>
 
@@ -91,7 +93,7 @@
           <el-dialog title="新建模型" v-model="modelVisiable" width="30%">
             <el-form label-width="120px">
               <el-form-item label="文件Id" required>
-                <el-input v-model="form.fileInfoId"></el-input>
+                <el-input v-model="form.fileInfoId" ></el-input>
               </el-form-item>
               <el-form-item label="模型名称" required>
                 <el-input v-model="form.modelName"></el-input>
@@ -167,7 +169,7 @@ export default {
       pageIndex: 1,
       pageSize: 10,
     });
-    const fileId=1;
+    const fileId=ref(1);
     //new TODO
     //TODO
     const fieldNameList=[]; //字段名
@@ -182,7 +184,6 @@ export default {
     const tableData = ref([]);
     const selectData = ref([]);
     const pageTotal = ref(0);
-
     const modelData=ref([]);
     const config=ref([]);
     const route=useRoute()
@@ -244,11 +245,11 @@ export default {
               showRegParam.value=true;
               showElasticNetParam.value=true;
               break;
-            case '6'||'7'||'8':
+            case '5'||'6'||'7':
               showCategory.value=true;
               showTrainingDataSetOccupy.value=true;
               break;
-            case '9':
+            case '8':
               showNumOfCluster.value=true;
               showSeed.value=true;
 
@@ -268,7 +269,10 @@ export default {
 
           modelData.value=res.data.modelInfos;
           console.log("tableData",tableData);
+          fileId.value=tableData.value[0].fileInfoId;
+          form.fileInfoId=(String)(fileId.value)
         })
+
       }
 
     };
@@ -298,9 +302,10 @@ export default {
 
 
     const saveModel = () => {
-      modelVisiable.value = false;
-
-      //todo: 调用Model相关接口
+      modelVisiable.value = false
+      form.fileInfoId=tableData.value[0].fileInfoId
+      console.log(form.fileInfoId)
+      //todo:   调用Model相关接口
       console.log("savemodel",form);
       const payload={modelTypeId:form.modelTypeId,
                      configId:form.configId,
@@ -390,6 +395,7 @@ export default {
       modelData,
       editVisible,
       form,
+      fileId,
       showMaxIter,
       saveModel,
       showRegParam,

+ 3 - 2
src/views/ConfigList.vue

@@ -136,6 +136,7 @@ import { ref, reactive } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { fetchData } from "../api/index";
 import {addConfig, deleteModelByModelId, getAllConfig} from "../api/config";
+import {useRouter} from "vue-router";
 
 export default {
     name: "config",
@@ -263,8 +264,8 @@ export default {
 
         const getConfigDetail=(row,column,event)=>{
           var configId=row.configId;
-          //todo:双击跳转到config界面
-          console.log("跳转到config详情界面")
+         let router=useRouter()
+          router.push(`/ConfigDetail?configId=${configId}`)
         }
         // 表格编辑时弹窗和保存
         const editVisible = ref(false);

+ 7 - 2
src/views/ModelList.vue

@@ -197,8 +197,13 @@ export default {
           .then(() => {
             console.log(tableData)
             let modelId=tableData.value[index].modelId
-            
-            ElMessage.success("模型"+modelId+"训练成功");
+            train(modelId).then(res=>{
+              if(res.status===200)
+                ElMessage.success("模型"+modelId+"训练成功");
+              else
+                ElMessage.error("模型"+modelId+"失败");
+            })
+
 
           })
           .catch(() => {});