From b451bcdf065ddfdd5c46dce49e19707870cb4fa6 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 16 四月 2025 09:57:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/alarm/MmPredictAlarmMessageForm.vue | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/src/views/model/pre/alarm/MmPredictAlarmMessageForm.vue b/src/views/model/pre/alarm/MmPredictAlarmMessageForm.vue
index b690fc2..c84a693 100644
--- a/src/views/model/pre/alarm/MmPredictAlarmMessageForm.vue
+++ b/src/views/model/pre/alarm/MmPredictAlarmMessageForm.vue
@@ -47,23 +47,16 @@
:data="list"
row-key="id"
>
- <el-table-column prop="title" label="消息标题"/>
- <el-table-column prop="content" label="消息内容"/>
- <el-table-column prop="alarmObj" label="监控对象"/>
- <el-table-column prop="pointId" label="监控点位"/>
- <el-table-column prop="itemId" label="预测项"/>
- <el-table-column prop="outId" label="输出"/>
- <el-table-column prop="currentValue" label="当前值"/>
- <el-table-column prop="outTime" label="超出时间"/>
- <el-table-column prop="outValue" label="超出值"/>
- <el-table-column prop="alarmType" label="预警类型"/>
- <el-table-column prop="alarmTime" label="预警时间"/>
- <el-table-column prop="createTime" label="创建时间"/>
+ <el-table-column prop="title" label="消息标题" header-align="center" align="left" min-width="150"/>
+ <el-table-column prop="content" label="消息内容" header-align="center" align="left" min-width="200"/>
+ <el-table-column prop="alarmObj" label="监控对象" align="left" min-width="150"/>
+ <el-table-column prop="alarmType" label="预警类型" align="left" min-width="150"/>
+ <el-table-column prop="alarmTime" label="预警时间" align="left" min-width="150"/>
</el-table>
<!-- 分页 -->
<Pagination
- v-model:limit="queryParams.limit"
- v-model:page="queryParams.page"
+ v-model:limit="queryParams.pageSize"
+ v-model:page="queryParams.pageNo"
:total="total"
@pagination="getList"
/>
@@ -79,8 +72,8 @@
const total = ref(0) // 列表的总页数
const list = ref([]) // 字典表格数据
const queryParams = reactive({
- page: 1,
- limit: 10,
+ pageNo: 1,
+ pageSize: 10,
configId: undefined,
title: undefined,
content: undefined,
--
Gitblit v1.9.3