From 1220f5ca98b10b735a47c37a81fbfc554b01e2fe Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 20 一月 2025 14:41:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/item/index.vue | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/views/model/pre/item/index.vue b/src/views/model/pre/item/index.vue
index c1b6f60..8bf49b6 100644
--- a/src/views/model/pre/item/index.vue
+++ b/src/views/model/pre/item/index.vue
@@ -49,6 +49,20 @@
class="!w-240px"
/>
</el-form-item>
+ <el-form-item label="运行状态" prop="runStatus">
+ <el-select
+ v-model="queryParams.runStatus"
+ placeholder="请选择"
+ clearable
+ class="!w-240px">
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.ITEM_RUN_STATUS)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item>
<el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px"/>
@@ -97,7 +111,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 +120,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']"
>
@@ -146,7 +158,7 @@
import MmPredictItemChart from './MmPredictItemChart.vue'
import * as MmItemType from '@/api/model/pre/type'
import * as MmPredictItem from '@/api/model/pre/item'
-import {DICT_TYPE} from "@/utils/dict";
+import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
defineOptions({name: 'DataMmPredictItem'})
--
Gitblit v1.9.3