From d3fa001e7bb84b45bf7bdf876d02bafd768421ac Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期五, 12 七月 2024 21:50:37 +0800
Subject: [PATCH] 数采配置
---
static/js/worker.js | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index b80cfc3..8bcac61 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -272,7 +272,7 @@
try {
if(getInspectionValueType(item.i)==1){
let tell = currentSample.insProduct.find(m => m.id == item.i).tell?currentSample.insProduct.find(m => m.id == item.i).tell.split('&'):null;
- isPoint = tell[0].includes('/') // 鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
+ isPoint = PROJECT=='瑁呭鐢电紗'&&tell&&tell.length>0&&typeof tell[0] =='string'&&tell[0].includes('/') // 鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
comResult = compute(item.v.f.replace(/=/g, ' '),comValue, isPoint)
let list3 = list2.map(item=>item+'')
isToExponential = list3.some(val => val.includes('e+'))
@@ -608,8 +608,6 @@
}
}
-
-
/**
* 鏍规嵁鍧愭爣鑾峰彇鍒楀悕
* @param {Object} cellId
@@ -818,9 +816,9 @@
if(str.includes(',,')){
str = str.replace(new RegExp(',,', 'g'),'')
}
+ // console.log('str', str)
if(str.includes('&"/"&')){
return str.replace(new RegExp('&"/"&', 'g'),'/').replace(new RegExp('//', 'g'),'')
- return str.replaceAll('&"/"&', '/').replaceAll('//','')
} else if (isPoint) {
return str.replace('ABS', '').replace(/\(|\)/g, '')
}else {
--
Gitblit v1.9.3