From f443b27dd9dcf5af1339439689531536e85836c7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 12 三月 2024 15:55:48 +0800
Subject: [PATCH] 合并冲突
---
src/views/equipment/metering/index.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
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,
--
Gitblit v1.9.3