From 6f69337a2338cf79aaf890bac5f73ed6dd17d4a0 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sun, 7 Jul 2024 00:29:07 +0800
Subject: [PATCH] update code

---
 src/views/dashboard/index2.vue  |  2 +-
 src/views/model/index.vue       | 20 +++++++++++-----
 src/views/model/uploadModel.vue | 42 +++++++++++++++++++++++++++------
 3 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/src/views/dashboard/index2.vue b/src/views/dashboard/index2.vue
index c32f302..200cd50 100644
--- a/src/views/dashboard/index2.vue
+++ b/src/views/dashboard/index2.vue
@@ -176,7 +176,7 @@
       },100);
     }
     DeviceAPI.getStatus().then(d=>{
-      debugger;
+      
     });
   });
   </script>
diff --git a/src/views/model/index.vue b/src/views/model/index.vue
index 9922d3d..caf5a8f 100644
--- a/src/views/model/index.vue
+++ b/src/views/model/index.vue
@@ -32,7 +32,7 @@
             <el-button text type="primary" size="small"
               @click="doShowModelDetail(scope.row)"><i-ep-edit />查看</el-button>
             <el-button text type="primary" size="small"
-              @click="doUploadModel()"><i-ep-link/>互联</el-button>
+              @click="doProtocol()"><i-ep-link/>互联</el-button>
             <el-button text type="primary" size="small" @click="handleDelete(scope.row)"><i-ep-delete />删除</el-button>
           </template>
         </el-table-column>
@@ -82,14 +82,16 @@ function handleQuery() {
     tableData.value=d.data.data.model_list||[];
   });
   loading.value = true;
-  ElMessage.success("查询成功");
+  //ElMessage.success("查询成功");
   loading.value = false;
   
 }
-
-function doUploadModel(){
+const doUploadModel=()=>{
   router.replace({ path: "/modelMgr/uploadModel" });
 }
+function doProtocol(){
+  router.replace({ path: "/protocol/index" });
+}
 
 /** 重置查询 */
 function resetQuery() {
@@ -107,12 +109,18 @@ function handleSelectionChange(selection: any) {
 
 /** 删除数据 */
 function handleDelete(row: { [key: string]: any }) {
-  ElMessageBox.confirm("确认删除算子?", "警告", {
+  ElMessageBox.confirm("确认删除模型?", "警告", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
   }).then(function () {
-    ElMessage.success("删除成功");
+    ModelApi.deleteModel(row.model_id).then(d=>{
+      if(d.data.code==0){
+        ElMessage.success("删除成功");
+        handleQuery();
+      }
+    })
+    
   });
 }
 
diff --git a/src/views/model/uploadModel.vue b/src/views/model/uploadModel.vue
index bfca290..e286505 100644
--- a/src/views/model/uploadModel.vue
+++ b/src/views/model/uploadModel.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="app-container">
-        <div class="search-container" style="padding-top:4px;">
+    <div class="app-container upload-model">
+        <div class="search-container" style="padding-top:4px;padding-right:20px;">
             <h4>模型基本信息</h4>
             <el-form ref="uploadForm" :rules="upRules" :model="upForm" label-width="120">
                 <el-row>
@@ -9,19 +9,27 @@
                             <el-input v-model="upForm.model_name" placeholder="请输入模型名称" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="12" class="div-mode-type">
+                        <el-row>
+                            <el-col :span="14">
                         <el-form-item label="模型类型" prop="modl_main_type">
-                            <el-select v-model="upForm.modl_main_type" placeholder="请选择" style="width: 48%"
+                            <el-select v-model="upForm.modl_main_type" placeholder="请选择" 
                                 @change="doMainTypeChange">
                                 <el-option v-for="(it, idx) in listOpt.modelType" :key="idx"
                                     :label="it.modl_main_type_name" :value="it.modl_main_type" />
                             </el-select>
-                            <el-select v-model="upForm.modl_sub_type" placeholder="请选择"
-                                style="width: 48%;margin-left:2%;">
+                        </el-form-item>
+                    </el-col>
+                            <el-col :span="10">
+                                <el-form-item label="" prop="modl_sub_type" class="form-item-sub-type">
+                            <el-select v-model="upForm.modl_sub_type" placeholder="请选择">
                                 <el-option v-for="(it, idx) in listOpt.modelSubType" :key="idx"
                                     :label="it.modl_sub_type_name" :value="it.modl_sub_type" />
                             </el-select>
                         </el-form-item>
+                            </el-col>
+                        </el-row>
+                        
                     </el-col>
                 </el-row>
                 <el-row>
@@ -132,8 +140,16 @@ let listOpt = reactive({
     modelFileType: [],
     modelSubType: [],
 })
+let fileList=ref([])
+
 const doSave = () => {
-    router.replace({ path: "/modelMgr/index" })
+    uploadForm.value?.validate((valid) => {
+        if (valid) {
+            debugger
+            router.replace({ path: "/modelMgr/index" })
+        }
+    });
+    
 }
 const doBack = () => {
     router.replace({ path: "/modelMgr/index" })
@@ -160,6 +176,7 @@ const upRules = computed(() => {
     return {
         model_name: [{required: true,trigger: "blur",message: "请输入模型名称",},],
         modl_main_type: [{required: true,trigger: "blur",message: "请选择主类型",}],
+        modl_sub_type: [{required: true,trigger: "blur",message: "请选择子类型",}],
         model_version: [{required: true,trigger: "blur",message: "请输入模型版本",}],
         modl_framework: [{required: true,trigger: "blur",message: "请选择算法框架",}],
         modl_net_type: [{required: true,trigger: "blur",message: "请选择模型网络",}],
@@ -204,4 +221,15 @@ onMounted(() => {
         padding: 8px;
     }
 }
+</style>
+<style lang="scss">
+.upload-model{
+    .div-mode-type{
+        .form-item-sub-type{
+            .el-form-item__content{
+                margin-left:10px !important;
+            }
+        }
+    }
+}
 </style>
\ No newline at end of file