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/sche/scheme/index.vue | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/views/model/sche/scheme/index.vue b/src/views/model/sche/scheme/index.vue
index 6212a90..5fcca35 100644
--- a/src/views/model/sche/scheme/index.vue
+++ b/src/views/model/sche/scheme/index.vue
@@ -52,7 +52,7 @@
<ContentWrap>
<el-table v-loading="loading" :data="list">
<el-table-column label="方案编号" align="center" prop="code" min-width="100"/>
- <el-table-column label="方案名称" align="center" prop="name" min-width="100"/>
+ <el-table-column label="方案名称" header-align="center" align="left" prop="name" min-width="100"/>
<el-table-column label="触发方式" align="center" prop="triggerMethod" min-width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.SCHE_TRIGGER_METHOD" :value="scope.row.triggerMethod" />
@@ -63,13 +63,19 @@
<el-table-column label="调整类型" align="center" prop="scheduleType" min-width="100"/>
<el-table-column label=" 调整策略" align="center" prop="scheduleStrategy" min-width="100"/>
<el-table-column label="调度时间" align="center" prop="scheduleTime" min-width="160" />
- <el-table-column label="备注" align="center" prop="remark" min-width="100" />
- <el-table-column label="状态" align="center" prop="status" min-width="100">
+ <el-table-column label="运行状态" align="center" prop="runStatus">
+ <template #default="scope">
+ <el-tag v-if="scope.row.runStatus + '' === '100'" size="small" type="success">{{scope.row.runStatus}}</el-tag>
+ <el-tag v-else size="small" type="danger">{{scope.row.runStatus}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="备注" header-align="center" align="left" prop="remark" min-width="160" />
+ <el-table-column label="是否启用" align="center" prop="status" min-width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
- <el-table-column label="操作" align="center" min-width="110" fixed="right">
+ <el-table-column label="操作" align="center" min-width="100" fixed="right">
<template #default="scope">
<el-button
link
@@ -78,6 +84,14 @@
v-hasPermi="['sche:scheme:update']"
>
编辑
+ </el-button>
+ <el-button
+ link
+ type="primary"
+ @click="openRecordList(scope.row.id)"
+ v-hasPermi="['sche:record:query']"
+ >
+ 日志
</el-button>
<el-button
link
@@ -102,13 +116,14 @@
<!-- 表单弹窗：添加/修改 -->
<ScheduleSchemeForm ref="formRef" @success="getList" />
+ <!-- 表单弹窗：添加/修改 -->
+ <RecordList ref="recordRef" />
</template>
<script lang="ts" setup>
import {DICT_TYPE, getIntDictOptions} from '@/utils/dict'
- import {dateFormatter} from '@/utils/formatTime'
- import download from '@/utils/download'
import * as ScheduleSchemeApi from '@/api/model/sche/scheme'
import ScheduleSchemeForm from './ScheduleSchemeForm.vue'
+ import RecordList from './record/index.vue'
defineOptions({name: 'ScheduleScheme'})
@@ -171,6 +186,12 @@
}
}
+ /** 调用日志查看 */
+ const recordRef = ref()
+ const openRecordList = (id?: string) => {
+ recordRef.value.open(id)
+ }
+
/** 初始化 **/
onMounted(async () => {
await getList()
--
Gitblit v1.9.3