From 8bb7160c9c4fd7ce5893ee673647b13cc35410ae Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 03 三月 2025 17:27:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/alarm/index.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/model/pre/alarm/index.vue b/src/views/model/pre/alarm/index.vue
index 7cd8501..651f6cc 100644
--- a/src/views/model/pre/alarm/index.vue
+++ b/src/views/model/pre/alarm/index.vue
@@ -42,21 +42,23 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list">
- <el-table-column label="消息标题" header-align="center" align="center" min-width="150" prop="title" fixed/>
+ <el-table-column label="消息标题" header-align="center" align="left" min-width="150" prop="title" fixed/>
<el-table-column label="监控对象" header-align="center" align="center" min-width="150" prop="alarmObj" />
- <el-table-column label="预测项" header-align="center" align="center" min-width="150" prop="itemName" />
+ <el-table-column label="预测项" header-align="center" align="left" min-width="150" prop="itemName" />
<el-table-column label="输出" header-align="center" align="center" min-width="150" prop="outName" />
<el-table-column label="比较长度" header-align="center" align="center" min-width="100" prop="compLength" />
- <el-table-column label="上限" header-align="center" align="center" min-width="50" prop="upperLimit" />
- <el-table-column label="下限" header-align="center" align="center" min-width="50" prop="lowerLimit" />
- <el-table-column label="单位" header-align="center" align="center" min-width="50" prop="unit" />
+ <el-table-column label="预测上限" header-align="center" align="center" min-width="100" prop="upperLimit" />
+ <el-table-column label="预测下限" header-align="center" align="center" min-width="100" prop="lowerLimit" />
+ <el-table-column label="累计上限" header-align="center" align="center" min-width="100" prop="culUpper" />
+ <el-table-column label="累计下限" header-align="center" align="center" min-width="100" prop="culLower" />
+ <el-table-column label="单位" header-align="center" align="center" min-width="100" prop="unit" />
<el-table-column label="转换系数" header-align="center" align="center" min-width="100" prop="coefficient" />
<el-table-column label="是否启用" header-align="center" align="center" min-width="100" prop="isEnable" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.COM_IS_INT" :value="scope.row.isEnable" />
</template>
</el-table-column>
- <el-table-column label="操作" align="center" min-width="180" fixed="right">
+ <el-table-column label="操作" align="center" min-width="160" fixed="right">
<template #default="scope">
<el-button
link
@@ -79,7 +81,7 @@
type="primary"
@click="handleView(scope.row.id)"
>
- 查看历史
+ 记录
</el-button>
</template>
</el-table-column>
--
Gitblit v1.9.3