From 017886be8a6c07ccaaf6300b8c7652ddbd41d734 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 15 一月 2024 16:50:08 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/AlarmManager.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/AlarmManager.vue b/src/views/mdc/base/AlarmManager.vue
index 83c5383..acd894f 100644
--- a/src/views/mdc/base/AlarmManager.vue
+++ b/src/views/mdc/base/AlarmManager.vue
@@ -171,7 +171,7 @@
<a-table
ref="table"
size="middle"
- :scroll="{x:true}"
+ :scroll="{x:'max-content',y:465}"
bordered
rowKey="id"
:columns="columns"
@@ -258,20 +258,23 @@
title: '鎶ヨ鍙�',
align: "center",
// sorter: true,
- dataIndex: 'alarmCode'
+ dataIndex: 'alarmCode',
+ width:400
},
{
title: '鎶ヨ鍐呭',
align: "center",
// sorter: true,
- dataIndex: 'alarmContent'
+ dataIndex: 'alarmContent',
+ width:400
},
{
title: '璁惧椹卞姩绫诲瀷',
align: "center",
// sorter: true,
- dataIndex: 'driveType'
+ dataIndex: 'driveType',
+ width:400
},
// {
// title: '鏄惁杩囨护',
@@ -283,6 +286,7 @@
dataIndex:'isUse_dictText',
title: '鏄惁杩囨护',
align: "center",
+ width:380
// dictCode:'alarm_is_use'
},
{
@@ -290,7 +294,7 @@
dataIndex: 'action',
align: "center",
fixed: "right",
- width: 147,
+ width: 150,
scopedSlots: { customRender: 'action' }
}
],
--
Gitblit v1.9.3