From 0479e3bcf39f458669ecd95bf43c20b7a1b1929e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 02 八月 2024 14:17:39 +0800
Subject: [PATCH] 数采升级-前端修改
---
static/js/worker.js | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index 08e8046..3d0c8d4 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -348,11 +348,13 @@
let num = 0
let str = a[b].v.ct.fa.split('.')[1]
num = str.length
- a[b].v.v = comResult?Number(comResult).toFixed(num):0
+ a[b].v.v = comResult?Number(comResult).toFixed(num):comResult
}else{
let val = parseFloat(Number(comResult).toFixed(3))
- a[b].v.v = isNaN(val) ? '' : val
+ a[b].v.v = isNaN(val) ? comResult : val
}
+ // console.log('a[b].v.ct', comResult)
+ // console.log('a[b].v.v', a[b].v.v)
}catch(error){
a[b].v.v = comResult
console.log('error---', error)
@@ -459,14 +461,18 @@
* @returns 杩斿洖澶勭悊鍚庣殑鍙傛暟瀵硅薄
*/
function getParam(){
- for (var b in param){
- param[b].insValue = []
- param[b].comValue = []
- param[b].equipValue = []
- param[b].equipName = []
- param[b].resValue = null
- param[b].insResult = null
- }
+ tableList[0].arr.forEach(a=>{
+ a.forEach(b=>{
+ if(param[b.i]){
+ param[b.i].insValue = []
+ param[b.i].comValue = []
+ param[b.i].equipValue = []
+ param[b.i].equipName = []
+ param[b.i].resValue = null
+ param[b.i].insResult = null
+ }
+ })
+ })
tableList[0].arr.forEach(a => {
a.forEach(b=>{
if (b.v.ps != undefined &&typeof b.v.ps.value =='string'&& b.v.ps.value.includes('妫�楠屽��')) {
@@ -867,7 +873,7 @@
} else if (isPoint) {
return str.replace('ABS', '').replace(/\(|\)/g, '')
}else {
- // console.log('str', str)
+ console.log('str', str,eval(str))
return eval(str)
}
} catch (error) {
--
Gitblit v1.9.3