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/MdcEquipmentTypeList.vue |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/mdc/base/MdcEquipmentTypeList.vue b/src/views/mdc/base/MdcEquipmentTypeList.vue
index b83a7e8..27bdd0e 100644
--- a/src/views/mdc/base/MdcEquipmentTypeList.vue
+++ b/src/views/mdc/base/MdcEquipmentTypeList.vue
@@ -59,7 +59,9 @@
         :loading="loading"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
-        @change="handleTableChange">
+        @change="handleTableChange"
+        :scroll="{x:'max-content',y:465}"
+      >
 
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
@@ -139,25 +141,30 @@
           {
             title:'璁惧绫诲瀷鍚嶇О',
             align:"center",
-            dataIndex: 'equipmentTypeName'
+            dataIndex: 'equipmentTypeName',
+            width:530
           },
           {
             title:'璁惧绫诲瀷鍥剧墖',
             align:"center",
             dataIndex: 'equipmentTypePictures',
-            scopedSlots: {customRender: 'imgSlot'}
+            scopedSlots: {customRender: 'imgSlot'},
+            width:530
           },
           {
             title:'璁惧绫诲瀷鐘舵��',
             align:"center",
             dataIndex: 'equipmentTypeStates',
             customRender: (text) => (text ? filterMultiDictText(this.dictOptions['equipmentTypeStates'], text) : ''),
+            width:530
           },
           {
             title: '鎿嶄綔',
             dataIndex: 'action',
             align:"center",
-            scopedSlots: { customRender: 'action' }
+            scopedSlots: { customRender: 'action' },
+            width:150,
+            fixed:'right'
           }
         ],
         url: {

--
Gitblit v1.9.3