From 69f7fe4fdea0e9e00f73818bfe5fe7bdab40bd1b Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期五, 20 九月 2024 18:19:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/model/mpk/project/ProjectPackageModelDialog.vue | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/model/mpk/project/ProjectPackageModelDialog.vue b/src/views/model/mpk/project/ProjectPackageModelDialog.vue index 531b66f..a9d7f10 100644 --- a/src/views/model/mpk/project/ProjectPackageModelDialog.vue +++ b/src/views/model/mpk/project/ProjectPackageModelDialog.vue @@ -31,9 +31,9 @@ row-key="id" border > + <el-table-column prop="pyChineseName" label="模型中文名称"/> <el-table-column prop="pyName" label="模型名称"/> - <el-table-column prop="pkgName" label="包名"/> - <el-table-column prop="pyModule" label="模型路径" width="300px"/> + <el-table-column prop="pyType" label="模型类型" :formatter="(r,c,v) => getDictLabel(DICT_TYPE.MODEL_TYPE,v)"/> <el-table-column prop="remark" label="备注" width="300px"/> <el-table-column label="模型方法" type="expand" width="100px"> <template #default="props"> @@ -41,6 +41,7 @@ <el-table-column align="center" label="方法名" prop="methodName" /> <el-table-column align="center" label="参数长度" prop="dataLength" /> <el-table-column align="center" label="是否有model" prop="model" :formatter="(row,column,cellValue) => cellValue === 1 ? 'true' : 'false'" /> + <el-table-column align="center" label="结果key" prop="resultKey" /> </el-table> </template> </el-table-column> @@ -60,6 +61,7 @@ import * as projectHistoryApi from '@/api/mpk/projectPackageHistory' import * as projectApi from '@/api/mpk/project' import { dateFormatter } from '@/utils/formatTime' + import { DICT_TYPE, getDictLabel } from '@/utils/dict' const { t } = useI18n() // 国际化 -- Gitblit v1.9.3