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 +++---
src/components/do/b3-work-time-management/work-time-statistics.vue | 2 ++
src/components/view/b3-classes.vue | 13 ++++++++++++-
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-statistics.vue b/src/components/do/b3-work-time-management/work-time-statistics.vue
index 70f7bc3..d7d6d4c 100644
--- a/src/components/do/b3-work-time-management/work-time-statistics.vue
+++ b/src/components/do/b3-work-time-management/work-time-statistics.vue
@@ -99,6 +99,7 @@
requiredAdd: [],
requiredUp: [],
accept:聽'.xlsx',
+ sort: false,
inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
cellSpecialStyle:{
redColorByKey:'Hours'
@@ -114,6 +115,7 @@
order: 'desc'
}
},
+ sort: false,
isIndex: true,
showSelect: false,
select: false,
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
}
})
}
diff --git a/src/components/view/b3-classes.vue b/src/components/view/b3-classes.vue
index 90cc096..7fb7bad 100644
--- a/src/components/view/b3-classes.vue
+++ b/src/components/view/b3-classes.vue
@@ -576,7 +576,16 @@
})
},
obtainItemParameterList() {
- this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
+ if(this.PROJECT == '妫�娴嬩腑蹇�') {
+ this.laboratory = [{
+ label: '閫氫俊浜у搧瀹為獙瀹�',
+ value: '閫氫俊浜у搧瀹為獙瀹�'
+ }, {
+ label: '鐢靛姏浜у搧瀹為獙瀹�',
+ value: '鐢靛姏浜у搧瀹為獙瀹�'
+ }]
+ } else {
+ this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
let data = []
res.data.forEach(a => {
data.push({
@@ -586,6 +595,8 @@
})
this.laboratory = data
})
+ }
+
},
handleCommand(e,m){
if(e!=m.shift){
--
Gitblit v1.9.3