From 69eba97000521c196532a2c470632230cd5e5928 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 11 七月 2024 18:05:47 +0800
Subject: [PATCH] 修改win7不兼容
---
static/js/worker.js | 48 ++++++++++++------------
src/components/do/b1-inspect-order-plan/Inspection.vue | 1
package.json | 2
src/util/excelFountion.js | 11 +++--
4 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/package.json b/package.json
index 1e8ffa0..2be4574 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"author": "LL",
"private": true,
"scripts": {
- "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
+ "dev": "webpack-dev-server --inline --host 0.0.0.0 --progress --config build/webpack.dev.conf.js",
"start": "npm run dev",
"build": "node build/build.js"
},
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 2e1051f..e70a6a0 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1825,7 +1825,6 @@
},
getValue(v){
let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>').replace(new RegExp('@', 'g'), '<br/>'):'')
- // str.replace(new RegExp(search, 'g'), replace)
return str
},
getInspectionValueType(id) {
diff --git a/src/util/excelFountion.js b/src/util/excelFountion.js
index 80c6e2e..d0d6f53 100644
--- a/src/util/excelFountion.js
+++ b/src/util/excelFountion.js
@@ -271,10 +271,11 @@
'AVERAGE',
'ABS',
]
- f = f.replace(regex, ',').replaceAll('"&','').replaceAll('&"','')
+ 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) {
diff --git a/static/js/worker.js b/static/js/worker.js
index f262b6e..a09aa41 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -37,7 +37,6 @@
}
let isToExponential = ''
let list2 = []
-
excelMethodList.forEach(item => {
if (item.valueList&&item.valueList.length>0&&item.valueList.find(m => m.r == r && m.c == c)) {
var comValue = {}
@@ -211,7 +210,7 @@
self.postMessage(JSON.stringify(result))
}
} catch (error) {
-
+ console.log('error---', error)
}
} else {
@@ -260,8 +259,9 @@
try{
let val = parseFloat(comResult.toFixed(3))
a[b].v.v = isNaN(val) ? '' : val
- }catch(e){
+ }catch(error){
a[b].v.v = comResult
+ console.log('error---', error)
}
break
}
@@ -287,7 +287,7 @@
}
self.postMessage(JSON.stringify(result))
} catch (error) {
-
+ console.log('error---', error)
}
}
@@ -415,7 +415,7 @@
}
return num;
} catch (error) {
-
+ console.log('error---', error)
}
}
/**
@@ -437,7 +437,7 @@
}
return max;
} catch (error) {
-
+ console.log('error---', error)
}
}
/**
@@ -457,7 +457,7 @@
}
return min;
} catch (error) {
-
+ console.log('error---', error)
}
}
/**
@@ -484,7 +484,7 @@
return null;
}
} catch (error) {
-
+ console.log('error---', error)
}
}
/**
@@ -497,7 +497,7 @@
try {
return Math.abs(val);
} catch (error) {
-
+ console.log('error---', error)
}
}
/**
@@ -528,7 +528,7 @@
return null;
}
} catch (error) {
-
+ console.log('error---', error)
}
}
@@ -549,7 +549,7 @@
}
}
} catch (error) {
-
+ console.log('error---', error)
}
}
@@ -575,7 +575,7 @@
letter += String.fromCharCode(65 + (i % 26));
return letter + (parseInt(cellId[1]) + 1);
}catch(e){
- console.log('error',cellId)
+ console.log('error',e)
}
}
/**
@@ -617,7 +617,7 @@
}
return id;
}catch(e){
- console.log('error',id)
+ console.log('error',e)
}
}
@@ -651,7 +651,7 @@
})
return arr2;
} catch (error) {
-
+ console.log('error',error)
}
}
/**
@@ -670,16 +670,16 @@
'AVERAGE',
'ABS',
]
- f = f.replace(regex, ',').replaceAll('"&','').replaceAll('&"','')
+ 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'),',')
})
let arr = f.split(',').filter(item=>{
return item&& /[a-zA-Z]/.test(item)&&item!='undefined'&&item!='null'
});
return arr;
} catch (error) {
-
+ console.log('error',error)
}
}
/**
@@ -697,7 +697,7 @@
})
return arr0;
} catch (error) {
-
+ console.log('error',error)
}
}
@@ -751,25 +751,25 @@
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])
}
if(str.includes(',,')){
- str = str.replaceAll(',,', '')
+ str = str.replace(new RegExp(',,', 'g'),'')
}
if(str.includes('&"/"&')){
- return str.replaceAll('&"/"&', '/').replaceAll('//','')
+ return str.replace(new RegExp('&"/"&', 'g'),'/').replace(new RegExp('//', 'g'),'')
}else {
return eval(str)
}
} catch (error) {
-
+ console.log('error',error)
}
}
--
Gitblit v1.9.3