From 5e18bf58d03f4b6830afddb92af9079dcc5587e2 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 11 三月 2024 09:25:26 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/equipment/metering/index.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index 7660b19..ecdc081 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/index.vue
@@ -68,8 +68,8 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- Download:false,
- isShow: true,
+ download:false,
+ isShow: true,
url: '/mes/equipmentDevice/upload'
},
prelang: 'workstation',
@@ -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