From 3ee153c34cd734bdb5845b60e6a207884d3b0838 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 22 四月 2026 17:58:36 +0800
Subject: [PATCH] 报告编制：印章生成调整
---
src/workers/InspectionWorker.worker.js | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/src/workers/InspectionWorker.worker.js b/src/workers/InspectionWorker.worker.js
index 5736162..06dd47e 100644
--- a/src/workers/InspectionWorker.worker.js
+++ b/src/workers/InspectionWorker.worker.js
@@ -177,8 +177,8 @@
// 濡傛灉褰撳墠妫�楠岄」鏄骇鍝佹楠岄」锛屽垯鎵ц姝ゆ柟娉曪紝鎵惧埌姝ゆ楠岄」鐨勮姹傚��
let ask = currentSample.insProduct.find((m) => m.id == item.i).ask
? currentSample.insProduct
- .find((m) => m.id == item.i)
- .ask.split("&")
+ .find((m) => m.id == item.i)
+ .ask.split("&")
: null;
// 鑾峰彇褰撳墠缁撹鐨勫弬鏁帮紝涔熷氨鏄綋鍓嶆楠岄」鐨勬渶缁堝��
let res = Object.values(comValue)[0];
@@ -395,14 +395,14 @@
let k = m.split("卤");
return (
eval(res) >=
- eval(
- handleFraction(k[0]) - handleFraction(k[1])
- ) &&
+ eval(
+ handleFraction(k[0]) - handleFraction(k[1])
+ ) &&
eval(res) <=
- eval(
- Number(handleFraction(k[0])) +
- Number(handleFraction(k[1]))
- )
+ eval(
+ Number(handleFraction(k[0])) +
+ Number(handleFraction(k[1]))
+ )
);
} else {
return handleMoreParam(res, m, "卤");
@@ -411,12 +411,12 @@
let k = m.split("卤");
return (
eval(res) >=
- eval(handleFraction(k[0]) - handleFraction(k[1])) &&
+ eval(handleFraction(k[0]) - handleFraction(k[1])) &&
eval(res) <=
- eval(
- Number(handleFraction(k[0])) +
- Number(handleFraction(k[1]))
- )
+ eval(
+ Number(handleFraction(k[0])) +
+ Number(handleFraction(k[1]))
+ )
);
}
} else if (m.includes("锛�")) {
@@ -506,8 +506,8 @@
// 濡傛灉妫�楠屽�肩被鍨嬫槸鏁板瓧杈撳叆妗�
let tell = currentSample.insProduct.find((m) => m.id == item.i).tell
? currentSample.insProduct
- .find((m) => m.id == item.i)
- .tell.split("&")
+ .find((m) => m.id == item.i)
+ .tell.split("&")
: null;
isPoint =
tell &&
@@ -607,9 +607,8 @@
// 澶勭悊excel鍑芥暟鍙傛暟鍒楄〃
item.valueList.forEach((a) => {
valueList.push({
- name: `${comparisonList.find((e) => e.value == a.c).label}${
- a.r + 1
- }`,
+ name: `${comparisonList.find((e) => e.value == a.c).label}${a.r + 1
+ }`,
value: 0,
});
});
@@ -796,7 +795,7 @@
return (
item >= eval(handleFraction(k[0]) - handleFraction(k[1])) &&
item <=
- eval(Number(handleFraction(k[0])) + Number(handleFraction(k[1])))
+ eval(Number(handleFraction(k[0])) + Number(handleFraction(k[1])))
);
case "~":
let j = str.split("~");
@@ -1249,6 +1248,21 @@
console.log("error", error);
}
}
+
+/**
+ * 瀹炵幇骞虫柟鏍瑰嚱鏁� SQRT
+ * @param {number} num 瑕佸紑骞虫柟鐨勬暟瀛�
+ * @returns {number} 绠楁湳骞虫柟鏍癸紝璐熸暟杩斿洖 NaN
+ */
+function SQRT(num) {
+ // 瀹炴暟鑼冨洿鍐咃紝璐熸暟娌℃湁骞虫柟鏍癸紝杩斿洖 NaN
+ if (num < 0) {
+ return NaN;
+ }
+ // 璋冪敤 JS 鍘熺敓楂樼簿搴﹀钩鏂规牴鍑芥暟
+ return Math.sqrt(num);
+}
+
/**
* 鑾峰彇鍖呭惈 ABC 瀛楃鐨勫垪琛�
*
@@ -1269,6 +1283,7 @@
"INT",
"IF",
"LOG",
+ "SQRT"
];
// 鏇挎崲鐗规畩瀛楃
f = f
--
Gitblit v1.9.3