From 60fdaf1c71f347560009cabb9ab3968ddfdac030 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 25 Apr 2024 11:47:27 +0800
Subject: [PATCH] =?UTF-8?q?[fix=2083978]=20=E8=A7=A3=E5=86=B3=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=86=85=E5=AE=B9=E6=92=91=E5=BC=80=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EquipmentManagement.vue                   | 12 +++++------
 .../systemSettings/SystemSettings.vue         | 20 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue
index 99cd3bd..dc9cf46 100644
--- a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue
+++ b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue
@@ -46,7 +46,7 @@
             bordered
             :rowKey="(row, index) => row.id || index"
             :loading="deviceData.loading"
-            :scroll="{x: true,y:206}"
+            :scroll="{x: 500,y:206}"
             :columns="deviceData.columns"
             :dataSource="deviceData.dataSource"
             :pagination="deviceData.ipagination"
@@ -248,28 +248,28 @@ export default {
             dataIndex: 'deviceStatus_dictText',
             title: '设备状态',
             align: 'center',
-            width: '20%',
+            width: 100,
             scopedSlots: { customRender: 'text' }
           },
           {
             dataIndex: 'deviceName',
             title: '设备名称',
             align: 'center',
-            width: '20%',
+            width: 100,
             scopedSlots: { customRender: 'text' }
           },
           {
             dataIndex: 'deviceSn',
             title: '设备SN码',
             align: 'center',
-            width: '20%',
+            width: 100,
             scopedSlots: { customRender: 'text' }
           },
           {
             dataIndex: 'wellheadId_dictText',
             title: '所属井口',
             align: 'center',
-            width: '20%',
+            width: 100,
             scopedSlots: { customRender: 'text' }
           },
           {
@@ -277,7 +277,7 @@ export default {
             dataIndex: 'action',
             scopedSlots: { customRender: 'action' },
             align: 'center',
-            width: 120
+            width: 100
           }
         ],
         dataSource: [],
diff --git a/src/views/systemOverview/systemSettings/SystemSettings.vue b/src/views/systemOverview/systemSettings/SystemSettings.vue
index 027f791..90addc3 100644
--- a/src/views/systemOverview/systemSettings/SystemSettings.vue
+++ b/src/views/systemOverview/systemSettings/SystemSettings.vue
@@ -51,7 +51,7 @@
             bordered
             rowKey="id"
             :loading="userInfo.loading"
-            :scroll="{x: true,y:286}"
+            :scroll="{x: 500,y:286}"
             :columns="userInfo.columns"
             :dataSource="userInfo.dataSource"
             :pagination="userInfo.ipagination"
@@ -147,7 +147,7 @@
             size="middle"
             bordered
             rowKey="id"
-            :scroll="{x: true,y:286}"
+            :scroll="{x: 300,y:286}"
             :columns="communicationLog.columns"
             :dataSource="communicationLog.dataSource"
             :pagination="communicationLog.ipagination"
@@ -227,28 +227,28 @@ export default {
             dataIndex: 'username',
             title: '用户名',
             align: 'center',
-            width: '20%',
+            width: 100,
             scopedSlots: { customRender: 'text' }
           },
           {
             dataIndex: 'phone',
             title: '联系方式',
             align: 'center',
-            width: '20%',
+            width: 100,
             scopedSlots: { customRender: 'text' }
           },
           {
             dataIndex: 'userType_dictText',
             title: '用户类别',
             align: 'center',
-            width: '20%',
+            width: 100,
             scopedSlots: { customRender: 'userType' }
           },
           {
             dataIndex: 'orgCodeTxt',
             title: '所属单位',
             align: 'center',
-            width: '20%',
+            width: 100,
             scopedSlots: { customRender: 'text' }
           },
           {
@@ -256,7 +256,7 @@ export default {
             dataIndex: 'action',
             scopedSlots: { customRender: 'action' },
             align: 'center',
-            width: '20%'
+            width: 100
           }
         ],
         dataSource: [],
@@ -285,21 +285,21 @@ export default {
             dataIndex: 'time',
             title: '时间',
             align: 'center',
-            width: '30%',
+            width: 90,
             scopedSlots: { customRender: 'text' }
           },
           {
             dataIndex: 'msgType',
             title: '消息类型',
             align: 'center',
-            width: '30%',
+            width: 90,
             scopedSlots: { customRender: 'msgType' }
           },
           {
             dataIndex: 'msgContent',
             title: '消息内容',
             align: 'center',
-            width: '40%',
+            width: 120,
             scopedSlots: { customRender: 'text' }
           }
         ],