From 39b0abc198534c9b69ac6d5969b12e7d76dd5e1d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 11 七月 2024 12:49:37 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/util/excelFountion.js | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/util/excelFountion.js b/src/util/excelFountion.js
index 1fa318f..80c6e2e 100644
--- a/src/util/excelFountion.js
+++ b/src/util/excelFountion.js
@@ -269,9 +269,9 @@
'MAX',
'MIN',
'AVERAGE',
- 'APS',
+ 'ABS',
]
- f = f.replace(regex, ',')
+ f = f.replace(regex, ',').replaceAll('"&','').replaceAll('&"','')
fouList.forEach(item=>{
f = f.replaceAll(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