From 25302c79050601784ac874f9cd2cc19519882207 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 15:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/tool/value-table.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 1688891..21dba9f 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -594,8 +594,8 @@
this.selectList('page')
},
selectList(val) {
- console.log('val---', val)
- console.log('this.page---', this.page)
+ // console.log('val---', val)
+ // console.log('this.page---', this.page)
this.loading = true
if(val===undefined){
this.page.current = 1;
@@ -628,7 +628,7 @@
this.tableData.map(item => {
Object.keys(item).forEach(val => {
if (item[val] === null && val.includes('Hours')) {
- item[val] = '/'
+ 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