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/MdcDriveTypeParamConfigList.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/views/mdc/base/MdcDriveTypeParamConfigList.vue b/src/views/mdc/base/MdcDriveTypeParamConfigList.vue
index 0af6e3b..1647dd9 100644
--- a/src/views/mdc/base/MdcDriveTypeParamConfigList.vue
+++ b/src/views/mdc/base/MdcDriveTypeParamConfigList.vue
@@ -187,7 +187,7 @@
<a-table
ref="table"
size="middle"
- :scroll="{x:true}"
+ :scroll="{x:'max-content',y:465}"
bordered
rowKey="id"
:columns="columns"
@@ -195,7 +195,6 @@
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- class="j-table-force-nowrap"
@change="handleTableChange"
>
@@ -313,44 +312,50 @@
title: '鎺у埗绯荤粺绫诲瀷',
align: "center",
// sorter: true,
- dataIndex: 'controlSystemType'
+ dataIndex: 'controlSystemType',
+ width: 300,
},
{
title: '涓枃鍚嶇О',
align: "center",
// sorter: true,
- dataIndex: 'chineseName'
+ dataIndex: 'chineseName',
+ width: 300,
},
{
title: '鑻辨枃鍚嶇О',
align: "center",
// sorter: true,
- dataIndex: 'englishName'
+ dataIndex: 'englishName',
+ width: 300,
},
{
title: '搴忓彿',
align: "center",
// sorter: true,
- dataIndex: 'sortNo'
+ dataIndex: 'sortNo',
+ width:100
},
{
title: '鏄剧ず鏍囧織',
align: "center",
dataIndex: 'showFlag',
customRender: (text) => (text ? filterMultiDictText(this.dictOptions['showFlag'], text) : ''),
+ width: 300,
},
{
title:'宸ヤ綔鏇茬嚎鏍囧織',
- align: "center",
- dataIndex: 'curveGenerationFlags',
- customRender: (text) => (text ? filterMultiDictText(this.dictOptions['curveGenerationFlags'], text) : ''),
+ align: "center",
+ dataIndex: 'curveGenerationFlags',
+ customRender: (text) => (text ? filterMultiDictText(this.dictOptions['curveGenerationFlags'], text) : ''),
+ width: 300,
},
{
title: '鎿嶄綔',
dataIndex: 'action',
align: "center",
- fixed: "right",
- width: 147,
+ width: 150,
+ fixed:'right',
scopedSlots: { customRender: 'action' }
}
],
--
Gitblit v1.9.3