From f4e6a890da2884777281031a9c736c7659c2a74a Mon Sep 17 00:00:00 2001 From: dongyukun <1208714201@qq.com> Date: 星期四, 02 一月 2025 14:20:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/model/pre/item/index.vue | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/model/pre/item/index.vue b/src/views/model/pre/item/index.vue index c1b6f60..883fe9d 100644 --- a/src/views/model/pre/item/index.vue +++ b/src/views/model/pre/item/index.vue @@ -97,7 +97,7 @@ <el-table-column label="运行时间" min-width="150" align="center" prop="lastTime"/> <el-table-column label="运行状态" align="center" prop="runStatus"> <template #default="scope"> - <dict-tag :type="DICT_TYPE.ITEM_RUN_STATUS" :value="scope.row.runStatus" /> + <dict-tag :type="DICT_TYPE.ITEM_RUN_STATUS" :value="scope.row.runStatus || 200" /> </template> </el-table-column> <el-table-column label="运行耗时(ms)" align="center" prop="duration"/> @@ -106,17 +106,15 @@ <el-button link type="primary" - size="mini" @click="openForm('update', scope.row.id, scope.row.itemtypename)" v-hasPermi="['model:pre-item:update']" > 编辑 </el-button> - <el-button link size="mini" type="primary" @click="chartHandle(scope.row)">数据</el-button> + <el-button link type="primary" @click="chartHandle(scope.row)">数据</el-button> <el-button link type="danger" - size="mini" @click="handleDelete(scope.row.id)" v-hasPermi="['model:pre-item:delete']" > -- Gitblit v1.9.3