From e1e206d066f153f8eac25d487d18b4a6b770e5b4 Mon Sep 17 00:00:00 2001
From: hbk01 <3243430237@qq.com>
Date: Sat, 14 Jan 2023 21:35:51 +0800
Subject: [PATCH] =?UTF-8?q?+=20=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=20CAS-14-006=20=E7=9A=84=E6=9C=89=E6=95=88?=
 =?UTF-8?q?=E6=9C=9F=20+=20=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=20CAB-14-002=20=E7=9A=84=E6=9C=89=E6=95=88=E6=9C=9F?=
 =?UTF-8?q?=20+=20=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=20CAB-14-004=20=E7=9A=84=E6=9C=89=E6=95=88=E6=9C=9F=20+=20?=
 =?UTF-8?q?=E6=A0=87=E6=B0=B4=E6=9B=B4=E6=94=B9=E6=98=BE=E7=A4=BA=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E4=BD=BF=E8=B4=9F=E5=8F=B7=E6=9B=B4=E6=B8=85=E6=A5=9A?=
 =?UTF-8?q?=20+=20=E6=A0=87=E6=B0=B4=20RD=20=E7=BB=93=E6=9E=9C=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E8=8C=83=E5=9B=B4=E6=97=B6=E5=B0=86=E4=BB=A5=E7=BA=A2?=
 =?UTF-8?q?=E8=89=B2=E5=AD=97=E4=BD=93=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 equipment.info.js |  6 +++---
 titer.html        | 43 +++++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/equipment.info.js b/equipment.info.js
index b033444..6529d9a 100644
--- a/equipment.info.js
+++ b/equipment.info.js
@@ -42,7 +42,7 @@ let info = [
         "where": "水分室",
         "name": "快干水分仪",
         "id": "CAS-14-006",
-        "expir": "2023.01.16"
+        "expir": "2024.01.08"
     },
     {
         "where": "水分室",
@@ -254,13 +254,13 @@ let info = [
         "where": "气相室",
         "name": "气相色谱仪",
         "id": "CAB-14-002",
-        "expir": "2023.01.04"
+        "expir": "2024.12.11"
     },
     {
         "where": "气相室",
         "name": "气相色谱仪",
         "id": "CAB-14-004",
-        "expir": "2023.01.04"
+        "expir": "2024.12.11"
     },
     {
         "where": "气相室",
diff --git a/titer.html b/titer.html
index 1abf841..ff88e3f 100644
--- a/titer.html
+++ b/titer.html
@@ -8,9 +8,11 @@
     <title>标水</title>
     <link rel="stylesheet" href="./github.css">
     <link rel="stylesheet" href="./theme.css">
-    <script src="./decimal.js"></script>
     <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-    <script>
+    <script type="module">
+        import { Decimal } from "./modules/decimal.mjs"
+        import { Formula } from "./modules/tools.js"
+
         let debug = false
         let tip = `<br>
         请输入三次 F 值<br>
@@ -24,20 +26,20 @@
         })
 
         $(document).ready(() => {
-            $(".msgbox").append(tip)
+            message(tip)
 
             $("#ok").click(() => {
                 let m0 = $("#m0").val()
                 let m1 = $("#m1").val()
                 let m2 = $("#m2").val()
-                f = average(m0, m1, m2)
+                let f = Formula.AVERAGE(m0, m1, m2).toFixed(4, Decimal.ROUND_HALF_EVEN)
 
                 let msg = `
                     <br>
                     F值平均值 = ${f}<br>
-                    RD1 = ${titer(f, m0)}<br>
-                    RD2 = ${titer(f, m1)}<br>
-                    RD3 = ${titer(f, m2)}<br>
+                    RD1 = ${format(titer(f, m0))}<br>
+                    RD2 = ${format(titer(f, m1))}<br>
+                    RD3 = ${format(titer(f, m2))}<br>
                 `
                 message(msg)
             })
@@ -54,15 +56,15 @@
             })
 
             if (debug) {
-                $("#m0").val(2)
-                $("#m1").val(3)
-                $("#m2").val(4)
+                $("#m0").val(5.1183)
+                $("#m1").val(5.1823)
+                $("#m2").val(5.0926)
             }
         })
 
         function message(msg) {
             $(".msgbox").empty()
-            $(".msgbox").append(msg)
+            $(".msgbox").html(msg)
         }
 
         /**
@@ -71,17 +73,15 @@
          * @param m 该次mg/mL的值
          */
         function titer(f, m) {
-            temp = decimal.sub(m, f)
-            return temp.div(f).mul(100)
+            let temp = decimal.sub(m, f)
+            return temp.div(f).mul(100).toFixed(2, Decimal.ROUND_HALF_EVEN)
         }
 
-        function average(a, b, c) {
-            let sum = Decimal(a).add(Decimal(b)).add(Decimal(c))
-            return decimal.div(sum, 3)
-        }
-
-        function checkNull(m0, m1, m2) {
-            return m0 == '' || m1 == '' || m2 == ''
+        function format(value, min = -1, max = 1) {
+            if (value <= min || value >= max) {
+                return `<span style='font-family: none; color: red;'>${value}</span>`
+            }
+            return `<span style='font-family: none;'>${value}</span>`
         }
 
     </script>
@@ -93,9 +93,8 @@
         <input type="number" id="m0" class="m0" placeholder="F1" inputmode="decimal"><br>
         <input type="number" id="m1" class="m1" placeholder="F2" inputmode="decimal"><br>
         <input type="number" id="m2" class="m2" placeholder="F3" inputmode="decimal"><br>
-        <br>
     </div>
-
+    <br>
     <div class="buttons">
         <button id="new_page">新开标签页</button>
         <button id="clear">清除内容</button>