From 0b39c2ea59763b1ac4cff0a1fb276414390ed121 Mon Sep 17 00:00:00 2001
From: jiang <jiang@bonus>
Date: Wed, 18 Dec 2024 14:40:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dataCenter/evaluate.js                |  2 +-
 src/api/dataCenter/evaluateDetails.js         | 10 ++--
 .../dataSet/child/addDataSetDialog.vue        |  8 +--
 .../evaluate/child/addEvaluateDetails.vue     | 54 +++++++++----------
 .../evaluate/child/customDialog.vue           |  6 ++-
 src/views/dataCenter/evaluate/index.vue       | 51 +++++++++---------
 6 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/src/api/dataCenter/evaluate.js b/src/api/dataCenter/evaluate.js
index 763ecd1b..d11a68d5 100644
--- a/src/api/dataCenter/evaluate.js
+++ b/src/api/dataCenter/evaluate.js
@@ -38,7 +38,7 @@ export function updateEvaluate(data) {
 // 删除模型评价
 export function delEvaluate(id) {
   return request({
-    url: '/ai/evaluate/' + id,
+    url: '/ai/evaluate/delete/' + id,
     method: 'post'
   })
 }
diff --git a/src/api/dataCenter/evaluateDetails.js b/src/api/dataCenter/evaluateDetails.js
index c08a2173..6bf74f78 100644
--- a/src/api/dataCenter/evaluateDetails.js
+++ b/src/api/dataCenter/evaluateDetails.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询模型评价详情列表
 export function listDetails(query) {
   return request({
-    url: '/system/details/list',
+    url: '/ai/evaluateDetails/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listDetails(query) {
 // 查询模型评价详情详细
 export function getDetails(id) {
   return request({
-    url: '/system/details/' + id,
+    url: '/ai/evaluateDetails/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getDetails(id) {
 // 新增模型评价详情
 export function addDetails(data) {
   return request({
-    url: '/system/details/add',
+    url: '/ai/evaluateDetails/add',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addDetails(data) {
 // 修改模型评价详情
 export function updateDetails(data) {
   return request({
-    url: '/system/details/edit',
+    url: '/ai/evaluateDetails/edit',
     method: 'post',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateDetails(data) {
 // 删除模型评价详情
 export function delDetails(id) {
   return request({
-    url: '/system/details/' + id,
+    url: '/ai/evaluateDetails/delete/' + id,
     method: 'post'
   })
 }
diff --git a/src/views/dataCenter/dataSet/child/addDataSetDialog.vue b/src/views/dataCenter/dataSet/child/addDataSetDialog.vue
index 106d8a0c..39ecdbea 100644
--- a/src/views/dataCenter/dataSet/child/addDataSetDialog.vue
+++ b/src/views/dataCenter/dataSet/child/addDataSetDialog.vue
@@ -56,11 +56,11 @@
 <!--            </div>-->
 <!--          </el-form-item>-->
         </div>
-        <el-form-item label="输出路径" prop="outputPath">
+<!--        <el-form-item label="输出路径" prop="outputPath">
           <el-input placeholder="请选择数据集输出路径" readonly :disabled="true" v-model="form.outputPath" class="input-with-select">
             <el-button slot="append" icon="el-icon-folder-opened" @click="selectFolder(1)"></el-button>
           </el-input>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <template #footer>
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -129,9 +129,9 @@ export default {
         inputPath:[
           { required: true, message: '导入路径不能为空', trigger: 'blur' },
         ],
-        outputPath:[
+        /* outputPath:[
           { required: true, message: '输出路径不能为空', trigger: 'blur' },
-        ],
+        ], */
       }
     };
   },
diff --git a/src/views/dataCenter/evaluate/child/addEvaluateDetails.vue b/src/views/dataCenter/evaluate/child/addEvaluateDetails.vue
index da0691c0..beedb64e 100644
--- a/src/views/dataCenter/evaluate/child/addEvaluateDetails.vue
+++ b/src/views/dataCenter/evaluate/child/addEvaluateDetails.vue
@@ -55,29 +55,34 @@ export default {
     return {
       form: {},
       rules: {
-        evaluateName: [
-          { required: true, message: '请输入模型名称', trigger: 'blur' }
+        justSqmple: [
+          { required: true, message: '请输入正样本数', trigger: 'blur' },
+          { pattern: /^[1-9]\d*$/, message: '只能输入正整数', trigger: 'blur' }
         ],
-        evaluateVersion: [
-          { required: true, message: '请输入版本号', trigger: 'blur' }
+        loseSample: [
+          { required: true, message: '请输入负样本数', trigger: 'blur' },
+          { pattern: /^[1-9]\d*$/, message: '只能输入正整数', trigger: 'blur' }
+
         ],
-        processSpeed: [
-          { required: true, message: '请输入处理速度', trigger: 'blur' }
+        tpNum: [
+          { required: true, message: '请输入TP数量', trigger: 'blur' },
+          { pattern: /^[1-9]\d*$/, message: '只能输入正整数', trigger: 'blur' }
+
         ],
-        memoryUsage: [{ required: true, message: '请输入内存占用', trigger: 'blur' }],
-        enviroConditions: [{ required: true, message: '请输入环境条件', trigger: 'blur' }]
+        tnNum:[{ required: true, message: '请输入TN数量', trigger: 'blur' },
+          { pattern: /^[1-9]\d*$/, message: '只能输入正整数', trigger: 'blur' }
+        ],
+        fpNum:[{ required: true, message: '请输入FP数量', trigger: 'blur' },
+          { pattern: /^[1-9]\d*$/, message: '只能输入正整数', trigger: 'blur' }
+        ],
+        fnNum:[{ required: true, message: '请输入FN数量', trigger: 'blur' },
+          { pattern: /^[1-9]\d*$/, message: '只能输入正整数', trigger: 'blur' }
+        ]
       }
     }
   },
   watch: {
     isOpen(newVal) {
-      if (newVal) {
-        if (this.id) {
-          getDetails(this.id).then(response => {
-            this.form = response.data
-          })
-        }
-      }
     }
   },
   methods: {
@@ -85,19 +90,12 @@ export default {
     submitForm() {
       this.$refs['form'].validate(valid => {
         if (valid) {
-          if (this.form.id != null) {
-            updateDetails(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-            })
-          } else {
-            addDetails(this.form).then(response => {
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
-            })
-          }
+          this.form.evaluateId = this.id
+          addDetails(this.form).then(response => {
+            this.$modal.msgSuccess('新增成功')
+            this.isOpen = false
+            this.getList()
+          })
         }
       })
     },
diff --git a/src/views/dataCenter/evaluate/child/customDialog.vue b/src/views/dataCenter/evaluate/child/customDialog.vue
index e9bed62f..4d739720 100644
--- a/src/views/dataCenter/evaluate/child/customDialog.vue
+++ b/src/views/dataCenter/evaluate/child/customDialog.vue
@@ -88,9 +88,11 @@ export default {
           { required: true, message: '请输入版本号', trigger: 'blur' }
         ],
         processSpeed: [
-          { required: true, message: '请输入处理速度', trigger: 'blur' }
+          { required: true, message: '请输入处理速度', trigger: 'blur' },
+          { pattern: /^[1-9]\d*$/, message: '只能输入正整数', trigger: 'blur' }
         ],
-        memoryUsage: [{ required: true, message: '请输入内存占用', trigger: 'blur' }],
+        memoryUsage: [{ required: true, message: '请输入内存占用', trigger: 'blur' },
+          { pattern: /^[1-9]$|^[1-9]\d$|^100$/, message: '请输入 1 到 100 的正整数', trigger: 'blur' }],
         enviroConditions: [{ required: true, message: '请输入环境条件', trigger: 'blur' }]
       }
     }
diff --git a/src/views/dataCenter/evaluate/index.vue b/src/views/dataCenter/evaluate/index.vue
index abda1bf2..410342e6 100644
--- a/src/views/dataCenter/evaluate/index.vue
+++ b/src/views/dataCenter/evaluate/index.vue
@@ -51,35 +51,38 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['evaluate:evaluate:export']"
-        >导出
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="evaluateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="模型名称" align="center" prop="evaluateName"/>
-      <el-table-column label="版本号" align="center" prop="evaluateVersion"/>
-      <el-table-column label="验证样本总数" align="center" prop="sampleAll"/>
-      <el-table-column label="准确率" align="center" prop="accuracyRate"/>
-      <el-table-column label="召回率" align="center" prop="recallRate"/>
-      <el-table-column label="精确率" align="center" prop="accurateRate"/>
-      <el-table-column label="F1分数" align="center" prop="fGrade"/>
-      <el-table-column label="处理速度(s)" align="center" prop="processSpeed"/>
-      <el-table-column label="内存占用" align="center" prop="memoryUsage"/>
-      <el-table-column label="环境条件" align="center" prop="enviroConditions"/>
-      <el-table-column label="创建人" align="center" prop="createBy"/>
-      <el-table-column label="创建时间" align="center" prop="createTime"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="模型名称" align="center" min-width="120" prop="evaluateName">
+        <template slot-scope="scope">
+          <router-link :to="{
+      path: '/dataCenter/dataSet-details/index/' + scope.row.datasetId,
+      query: { dataType: scope.row.dataType,_t: Date.now() }
+    }" class="link-type" @click=""
+          >
+            <span>{{ scope.row.evaluateName }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="版本号" align="center" min-width="120" prop="evaluateVersion"/>
+      <el-table-column label="验证样本总数" align="center" min-width="80" prop="sampleAll"/>
+      <el-table-column label="准确率" align="center" min-width="80" prop="accuracyRate"/>
+      <el-table-column label="召回率" align="center" min-width="80" prop="recallRate"/>
+      <el-table-column label="精确率" align="center" min-width="80" prop="accurateRate"/>
+      <el-table-column label="F1分数" align="center" min-width="80" prop="fgrade"/>
+      <el-table-column label="处理速度(s)" align="center" min-width="80" prop="processSpeed"/>
+      <el-table-column label="内存占用" align="center" min-width="80" prop="memoryUsage">
+        <template slot-scope="scope">
+          <span>{{ scope.row.memoryUsage + '%' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="环境条件" align="center" min-width="120" prop="enviroConditions"/>
+      <el-table-column label="创建人" align="center" min-width="120" prop="createBy"/>
+      <el-table-column label="创建时间" align="center" min-width="120" prop="createTime"/>
+      <el-table-column label="操作" align="center"  min-width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"