From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/DeviceParamThresholdManagement.vue | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/views/mdc/base/DeviceParamThresholdManagement.vue b/src/views/mdc/base/DeviceParamThresholdManagement.vue
index a0da603..2ed2a2d 100644
--- a/src/views/mdc/base/DeviceParamThresholdManagement.vue
+++ b/src/views/mdc/base/DeviceParamThresholdManagement.vue
@@ -25,6 +25,7 @@
:data-source="driveTypeList"
placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"
:filter-option="filterOption"
+ :allowClear="true"
/>
</a-form-item>
</a-col>
@@ -67,6 +68,7 @@
bordered
size="middle"
rowKey="id"
+ :scroll="{x:'max-content',y:600}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -116,6 +118,18 @@
name: 'DeviceParamThresholdManagement',
description: '杩欐槸璁惧鍙傛暟闃堝�肩鐞嗛〉闈�',
queryParam: {},
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination:{
+ current: 1,
+ pageSize: 30,
+ pageSizeOptions: ['30', '50', '100'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
columns: [
{
title: '#',
@@ -131,32 +145,32 @@
title: '涓枃鍚�',
align: 'center',
dataIndex: 'chineseName',
- width: 120
+ width: 350
// sorter: true
},
{
title: '鑻辨枃鍚�',
align: 'center',
- width: 150,
+ width: 350,
dataIndex: 'englishName'
},
{
title: '椹卞姩绫诲瀷',
align: 'center',
- width: 180,
+ width: 350,
dataIndex: 'controlSystemType'
},
{
title: '闃堝�间笂闄�',
align: 'center',
- width: 120,
+ width: 270,
dataIndex: 'maxThreshold'
// scopedSlots: {customRender: "avatarslot"}
},
{
title: '闃堝�间笅闄�',
align: 'center',
- width: 80,
+ width: 270,
dataIndex: 'minThreshold'
// sorter: true
},
@@ -165,7 +179,8 @@
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: 'center',
- width: 120
+ fixed: 'right',
+ width: 150
}
],
driveTypeList: [],
--
Gitblit v1.9.3