From e4beda2094872354bf5ab2c35a8838a6dc316c01 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期五, 12 七月 2024 13:14:13 +0800
Subject: [PATCH] 数采页面添加
---
src/util/excelFountion.js | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/util/excelFountion.js b/src/util/excelFountion.js
index 8399698..d0d6f53 100644
--- a/src/util/excelFountion.js
+++ b/src/util/excelFountion.js
@@ -269,12 +269,13 @@
'MAX',
'MIN',
'AVERAGE',
- 'APS',
+ 'ABS',
]
- f = f.replace(regex, ',')
+ f = f.replace(regex, ',').replace(new RegExp('"&', 'g'),'').replace(new RegExp('&"', 'g'),'')
fouList.forEach(item=>{
- f = f.replaceAll(item,',')
+ f = f.replace(new RegExp(item, 'g'),'')
})
+ console.log('f',f)
let arr = f.split(',').filter(item=>{
return item&& /[a-zA-Z]/.test(item)&&item!='undefined'&&item!='null'
});
@@ -353,14 +354,14 @@
obj[item] = item
}
})
- str = str.replaceAll(':', '-')
+ str = str.replace(new RegExp(':', 'g'),'')
// 鏇挎崲鍙傛暟
for (var a in obj) {
- str = str.replaceAll(a, obj[a])
+ str = str.replace(new RegExp(a, 'g'),obj[a])
}
// 璁＄畻
for (var a in arr) {
- str = str.replaceAll(a, arr[a])
+ str = str.replace(new RegExp(a, 'g'),arr[a])
}
return eval(str)
} catch (error) {
--
Gitblit v1.9.3