From d5c65b454f1ed2cc0cb8134a09366d26bb3434a8 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 04 七月 2024 13:55:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/util/excelFountion.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/util/excelFountion.js b/src/util/excelFountion.js
index 1fa318f..f237bc3 100644
--- a/src/util/excelFountion.js
+++ b/src/util/excelFountion.js
@@ -269,7 +269,7 @@
'MAX',
'MIN',
'AVERAGE',
- 'APS',
+ 'ABS',
]
f = f.replace(regex, ',')
fouList.forEach(item=>{
@@ -319,7 +319,9 @@
if(typeof(comValue[a])=='string'&&comValue[a].includes('^')){
// 璁＄畻骞傛
arr[a] = CalculatePower(comValue[a])
- }else{
+ } else if (typeof(comValue[a])=='string'&&comValue[a].includes('/')) {
+ arr[a] = comValue[a]
+ } else{
arr[a] = comValue[a]
}
}
--
Gitblit v1.9.3