From 56b7f5dd6fda8c39f0b7038a265d507e0d22227c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 24 七月 2024 14:56:35 +0800
Subject: [PATCH] 合并冲突
---
src/components/tool/value-table.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 6108005..21dba9f 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -628,7 +628,7 @@
this.tableData.map(item => {
Object.keys(item).forEach(val => {
if (item[val] === null && val.includes('Hours')) {
- item[val] = '0'
+ item[val] = 0
}
})
})
@@ -641,7 +641,7 @@
if (item.value.length === 4) {
item.width = 120
} else if (item.value.length === 3){
- item.width = 100
+ item.width = this.data.sort === false && item.label.includes('Hours') ? 50 : 100
} else if (item.value.length === 5){
item.width = 130
} else if (item.value.length === 7){
@@ -649,7 +649,7 @@
} else if (item.value.length === 6){
item.width = 150
} else {
- item.width = 86
+ item.width = this.data.sort === false && item.label.includes('Hours') ? 46 : 86
}
})
}
--
Gitblit v1.9.3