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/EquipmentList.vue |   64 +++++++++++++++++---------------
 1 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index 55ce880..c2b147a 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -64,6 +64,7 @@
         bordered
         size="middle"
         rowKey="id"
+        :scroll="{x:'max-content',y:465}"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
@@ -180,25 +181,25 @@
             title: '璁惧缂栧彿',
             align: "center",
             dataIndex: 'equipmentId',
-            width: 120,
+            width: 200,
             // sorter: true
           },
           {
             title: '璁惧鍚嶇О',
             align: "center",
-            width: 150,
+            width: 200,
             dataIndex: 'equipmentName',
           },
           {
             title: '杞﹂棿',
             align: "center",
-            width: 180,
+            width: 200,
             dataIndex: 'productionName'
           },
           {
             title: '璁惧绫诲瀷',
             align: "center",
-            width: 120,
+            width: 200,
             dataIndex: 'equipmentType',
             // scopedSlots: {customRender: "avatarslot"}
           },
@@ -206,33 +207,33 @@
           {
             title: '椹卞姩绫诲瀷',
             align: "center",
-            width: 80,
+            width: 200,
             dataIndex: 'driveType',
             // sorter: true
           },
           {
             title: '鏈哄簥IP',
             align: "center",
-            width: 100,
+            width: 200,
             dataIndex: 'equipmentIp'
           },
           {
             title: '璁惧鍔熺巼',
             align: "center",
-            width: 100,
+            width: 200,
             dataIndex: 'devicePower'
           },
           {
             title: '閮ㄩ棬',
             align: "center",
-            width: 180,
+            width: 200,
             dataIndex: 'orgCodeTxt'
           },
 
           {
             title: '绯荤粺鐗堟湰',
             align: "center",
-            width: 80,
+            width: 200,
             dataIndex: 'systemVersion'
           },
           {
@@ -240,7 +241,8 @@
             dataIndex: 'action',
             scopedSlots: {customRender: 'action'},
             align: "center",
-            width: 120
+            width: 150,
+            fixed:'right'
           }
 
         ],
@@ -290,25 +292,25 @@
                   title: '璁惧缂栧彿',
                   align: "center",
                   dataIndex: 'equipmentId',
-                  width: 120,
+                  width: 200,
                   // sorter: true
                 },
                 {
                   title: '璁惧鍚嶇О',
                   align: "center",
-                  width: 150,
+                  width: 200,
                   dataIndex: 'equipmentName',
                 },
                 {
                   title: '杞﹂棿',
                   align: "center",
-                  width: 180,
+                  width: 200,
                   dataIndex: 'productionName'
                 },
                 {
                   title: '璁惧绫诲瀷',
                   align: "center",
-                  width: 120,
+                  width: 200,
                   dataIndex: 'equipmentType',
                   // scopedSlots: {customRender: "avatarslot"}
                 },
@@ -316,33 +318,33 @@
                 {
                   title: '椹卞姩绫诲瀷',
                   align: "center",
-                  width: 80,
+                  width: 200,
                   dataIndex: 'driveType',
                   // sorter: true
                 },
                 {
                   title: '鏈哄簥IP',
                   align: "center",
-                  width: 100,
+                  width: 200,
                   dataIndex: 'equipmentIp'
                 },
                 {
                   title: '璁惧鍔熺巼',
                   align: "center",
-                  width: 100,
+                  width: 200,
                   dataIndex: 'devicePower'
                 },
                 // {
                 //   title: '閮ㄩ棬',
                 //   align: "center",
-                //   width: 180,
+                //   width: 200,
                 //   dataIndex: 'orgCodeTxt'
                 // },
 
                 {
                   title: '绯荤粺鐗堟湰',
                   align: "center",
-                  width: 80,
+                  width: 200,
                   dataIndex: 'systemVersion'
                 },
                 {
@@ -350,7 +352,8 @@
                   dataIndex: 'action',
                   scopedSlots: {customRender: 'action'},
                   align: "center",
-                  width: 120
+                  width: 150,
+                  fixed:'right'
                 }
 
               ]
@@ -370,25 +373,25 @@
                   title: '璁惧缂栧彿',
                   align: "center",
                   dataIndex: 'equipmentId',
-                  width: 120,
+                  width: 200,
                   // sorter: true
                 },
                 {
                   title: '璁惧鍚嶇О',
                   align: "center",
-                  width: 150,
+                  width: 200,
                   dataIndex: 'equipmentName',
                 },
                 {
                   title: '杞﹂棿',
                   align: "center",
-                  width: 180,
+                  width: 200,
                   dataIndex: 'productionName'
                 },
                 {
                   title: '璁惧绫诲瀷',
                   align: "center",
-                  width: 120,
+                  width: 200,
                   dataIndex: 'equipmentType',
                   // scopedSlots: {customRender: "avatarslot"}
                 },
@@ -396,33 +399,33 @@
                 {
                   title: '椹卞姩绫诲瀷',
                   align: "center",
-                  width: 80,
+                  width: 200,
                   dataIndex: 'driveType',
                   // sorter: true
                 },
                 {
                   title: '鏈哄簥IP',
                   align: "center",
-                  width: 100,
+                  width: 200,
                   dataIndex: 'equipmentIp'
                 },
                 {
                   title: '璁惧鍔熺巼',
                   align: "center",
-                  width: 100,
+                  width: 200,
                   dataIndex: 'devicePower'
                 },
                 {
                   title: '閮ㄩ棬',
                   align: "center",
-                  width: 180,
+                  width: 200,
                   dataIndex: 'orgCodeTxt'
                 },
 
                 {
                   title: '绯荤粺鐗堟湰',
                   align: "center",
-                  width: 80,
+                  width: 200,
                   dataIndex: 'systemVersion'
                 },
                 {
@@ -430,7 +433,8 @@
                   dataIndex: 'action',
                   scopedSlots: {customRender: 'action'},
                   align: "center",
-                  width: 120
+                  width: 150,
+                  fixed:'right'
                 }
 
               ]

--
Gitblit v1.9.3