From a19ea2098bd9ddbf9c81a58ad3faade25d8c6e7e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 01 八月 2024 14:02:03 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
static/js/worker.js | 76 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 14 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index 26ba16a..ba752fe 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -1,6 +1,6 @@
let code = ''
-let tableList = []
+let tableList = null
let excelMethodList = []
let comparisonList = []
let currentSample = {}
@@ -10,14 +10,45 @@
value:null
}
let param = null
+let currentTable = ''
self.onmessage = function(event) {
const data = JSON.parse(event.data);
+ if(currentTable!=data.currentTable){
+ tableList = data.tableList;
+ }
+ currentTable = data.currentTable;
+ if(data.type&&data.type=='saveData'){
+ tableList = data.tableList;
+ param = data.param;
+ return
+ }
code = data.code;
- tableList = JSON.parse(JSON.stringify(data.tableList));
+ if(tableList){
+ let str = code.split('-')
+ let r = str[1]
+ let c = str[2]
+ tableList[0].arr.forEach((item,index)=>{
+ item.forEach((m,i)=>{
+ if(m.c==c&&m.r==r){
+ tableList[0].arr[index] = data.tableList[0].arr[index]
+ }
+ })
+ })
+ }else{
+ tableList = data.tableList;
+ }
+ if(param){
+ let str = code.split('-')
+ let pId = str[3]
+ param[pId] = data.param[pId]
+ }else{
+ param = data.param;
+ }
+ // tableList = data.tableList;
+ // param = data.param;
excelMethodList = JSON.parse(JSON.stringify(data.excelMethodList));
comparisonList = JSON.parse(JSON.stringify(data.comparisonList));
currentSample = JSON.parse(JSON.stringify(data.currentSample));
- param = data.param;
PROJECT = data.PROJECT
changeInput('', code);
};
@@ -313,10 +344,17 @@
try{
if(comResult==0){
a[b].v.v = 0
+ }else if(a[b].v.ct&&a[b].v.ct.fa&&typeof a[b].v.ct.fa == 'string'&&a[b].v.ct.fa.includes('.')){
+ 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
}else{
- let val = parseFloat(comResult.toFixed(3))
- a[b].v.v = isNaN(val) ? '' : val
+ let val = parseFloat(Number(comResult).toFixed(3))
+ 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)
@@ -423,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('妫�楠屽��')) {
@@ -817,7 +859,13 @@
str = str.replace(new RegExp(a, 'g'),arr[a])
}
if(str.includes(',,')){
- str = str.replace(new RegExp(',,', 'g'),'')
+ str = str.replace(new RegExp(',,', 'g'),',')
+ }
+ if(str.includes(',,')){
+ str = str.replace(new RegExp(',,', 'g'),',')
+ }
+ if(str.includes(',,')){
+ str = str.replace(new RegExp(',,', 'g'),',')
}
// console.log('str', str)
if(str.includes('&"/"&')){
--
Gitblit v1.9.3