From c49d413fe39ee6cb9062f6fa915a3d203933a73a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 一月 2024 16:40:19 +0800
Subject: [PATCH] 设备样式修改

---
 src/views/equipment/equipment/index.vue |   44 +++++++++++++++++++++++---------------------
 vue.config.js                           |    2 +-
 src/views/equipment/metering/index.vue  |    6 ++++--
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 9fd2e4d..418e866 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -97,6 +97,7 @@
           // 璁惧缂栧彿
           {
             minWidth: '30',
+            width: '200',
             prop: 'number',
             label: '璁惧缂栧彿',
             sort: true,
@@ -110,8 +111,19 @@
           // 璁惧鍚嶇О
           {
             minWidth: '30',
+            width: '100',
             prop: 'name',
             label: '璁惧鍚嶇О',
+            sort: true,
+            isTrue: true,
+            isSearch: true,
+            searchInfoType: 'text'
+          },
+          // 鐘舵��
+          {
+            minWidth: '30',
+            prop: 'state',
+            label: '鐘舵��',
             sort: true,
             isTrue: true,
             isSearch: true,
@@ -151,15 +163,15 @@
             searchInfoType: 'text'
           },
           // 閭
-          {
-            minWidth: '30',
-            prop: 'email',
-            label: '閭',
-            sort: true,
-            isTrue: true,
-            isSearch: false,
-            searchInfoType: 'text'
-          },
+          // {
+          //   minWidth: '30',
+          //   prop: 'email',
+          //   label: '閭',
+          //   sort: true,
+          //   isTrue: true,
+          //   isSearch: false,
+          //   searchInfoType: 'text'
+          // },
           // 渚涘簲鍟�
           {
             minWidth: '30',
@@ -193,7 +205,7 @@
           // 鍒堕�犳棩鏈�
           {
             minWidth: '150',
-            width: '250',
+            width: '100',
             prop: 'manufactureDate',
             label: '鍒堕�犳棩鏈�',
             sort: true,
@@ -205,7 +217,7 @@
           // 瀹夎鏃ユ湡
           {
             minWidth: '150',
-            width: '250',
+            width: '100',
             prop: 'installDate',
             label: '瀹夎鏃ユ湡',
             sort: true,
@@ -213,16 +225,6 @@
             isSearch: true,
             formatter: this.formatReceiveTime,
             searchInfoType: 'datetimerange'
-          },
-          // 鐘舵��
-          {
-            minWidth: '30',
-            prop: 'state',
-            label: '鐘舵��',
-            sort: true,
-            isTrue: true,
-            isSearch: true,
-            searchInfoType: 'text'
           }
         ],
         toolbar: [],
diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index 05b49e8..ecdc081 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/index.vue
@@ -97,6 +97,7 @@
             // 璁惧缂栧彿
             {
               minWidth: '30',
+              width: '100',
               prop: 'code',
               label: '璁惧缂栧彿',
               sort: true,
@@ -110,6 +111,7 @@
             // 璁惧鍚嶇О
             {
               minWidth: '30',
+              width: '100',
               prop: 'name',
               label: '璁惧鍚嶇О',
               sort: true,
@@ -145,7 +147,7 @@
  // 鍒堕�犳棩鏈�
  {
               minWidth: '150',
-              width: '250',
+              width: '150',
               prop: 'createTime',
               label: '鏍″噯鏃堕棿',
               sort: true,
@@ -157,7 +159,7 @@
            
             {
               minWidth: '150',
-              width: '250',
+              width: '150',
               prop: 'updateTime',
               label: '鏍″噯鍒版湡鏃堕棿',
               sort: true,
diff --git a/vue.config.js b/vue.config.js
index f155495..2280c3d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,7 +7,7 @@
 // const url = 'http://192.168.2.7:9999'
 // const url = 'https://ztms-mes.chinaztt.cn/'
 
- const url = 'http://localhost:9999'
+const url = 'http://localhost:9999'
 
 
 const localUrl = 'http://localhost:8089'

--
Gitblit v1.9.3