From 84d12f2a9f883732219b273e697e23010af19c0f Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 15:29:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/EquipmentOperationParamsAlarm.vue | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/views/mdc/base/EquipmentOperationParamsAlarm.vue b/src/views/mdc/base/EquipmentOperationParamsAlarm.vue
index dddc8ac..8c4c192 100644
--- a/src/views/mdc/base/EquipmentOperationParamsAlarm.vue
+++ b/src/views/mdc/base/EquipmentOperationParamsAlarm.vue
@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item label="璁惧缂栧彿">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-model="queryParam.equipmentid"></a-input>
+ <j-input placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-model="queryParam.equipmentId"></j-input>
</a-form-item>
</a-col>
@@ -58,46 +58,57 @@
{
title: '璁惧缂栧彿',
align: 'center',
- dataIndex: 'equipmentid',
+ dataIndex: 'equipmentId',
width: 250
},
{
title: '鎶ヨ鏃堕棿',
align: 'center',
- dataIndex: 'collecttime',
+ dataIndex: 'createTime',
width: 250
},
{
title: '璁惧畾鍊�',
align: 'center',
width: 250,
- dataIndex: 'setvalue'
+ dataIndex: 'setValue'
},
{
title: '瀹為檯鍊�',
align: 'center',
width: 250,
- dataIndex: 'realvalue'
+ dataIndex: 'realValue'
},
- {
- title: '鎶ヨ鍙�',
- align: 'center',
- width: 250,
- dataIndex: 'alarmno'
- },
+ // {
+ // title: '鎶ヨ鍙�',
+ // align: 'center',
+ // width: 250,
+ // dataIndex: 'alarmno'
+ // },
{
title: '鎶ヨ鍐呭',
align: 'center',
width: 250,
- dataIndex: 'alarmcontent'
+ dataIndex: 'alarmContent'
}
],
url: {
- list: '/mdc/equipmentBeilvAlarm/list'
+ list: '/mdc/mdcOverrunAlarm/list'
+ },
+ ipagination:{
+ current: 1,
+ pageSize: 30,
+ pageSizeOptions: ['30', '50', '100'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
},
/* 鎺掑簭鍙傛暟 */
isorter: {
- column: 'collecttime',
+ column: 'createTime',
order: 'desc'
}
}
--
Gitblit v1.9.3