From d041bdf46d54955e9081b2acbd61f5353fc03a04 Mon Sep 17 00:00:00 2001
From: hbk01 <3243430237@qq.com>
Date: Sun, 12 Mar 2023 23:15:58 +0800
Subject: [PATCH] =?UTF-8?q?+=20=E5=B9=B2=E7=87=A5=E5=A4=B1=E9=87=8D?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E5=B9=B6=E6=8E=92=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=20+=20=E7=82=BD=E7=81=BC=E6=AE=8B=E6=B8=A3=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E5=B9=B6=E6=8E=92=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 views/lod.html | 93 +++++++++++++++++++++-----------------------------
 views/roi.html | 62 +++++++++++++++++++++------------
 2 files changed, 78 insertions(+), 77 deletions(-)

diff --git a/views/lod.html b/views/lod.html
index ed950ba..5c7ecc4 100644
--- a/views/lod.html
+++ b/views/lod.html
@@ -8,6 +8,18 @@
     <title>干燥失重</title>
     <link rel="stylesheet" href="../statics/github.css">
     <link rel="stylesheet" href="../statics/theme.css">
+    <style>
+        .container {
+            display: grid;
+            grid-template-columns: 1fr 1fr;
+            column-gap: 2%
+        }
+
+        input {
+            width: auto;
+        }
+
+    </style>
     <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
     <script type="module">
         import { Decimal } from "../statics/modules/decimal.mjs"
@@ -55,18 +67,13 @@
                 let lod2 = lod(m0r, m1r, m3r)
                 let average = decimal.add(lod1, lod2).div(2).toString()
 
-                let format = (value) => {
-                    if (value <= 0) return `<span style="color: red;">${value}</span>`
-                    return value
-                }
-
                 let msg = `<br>
-第一组干燥失重 = ${format(lod1)}<br>
-第二组干燥失重 = ${format(lod2)}<br>
-两组干燥失重平均值 = ${format(average)}<br>
-${m0l != '' && m1l != '' ? `第一组恒重后空瓶+样 = ${decimal.add(m0l, m1l).toString()}` : ''}<br>
-${m0r != '' && m1r != '' ? `第二组恒重后空瓶+样 = ${decimal.add(m0r, m1r).toString()}` : ''}<br>
-`
+                    第一组干燥失重 = ${format(lod1)}<br>
+                    第二组干燥失重 = ${format(lod2)}<br>
+                    两组干燥失重平均值 = ${format(average)}<br>
+                    第一组恒重后空瓶+样 = ${checkNull(m0l, m1l, '0') ? '0' : decimal.add(m0l, m1l).toString()}<br>
+                    第二组恒重后空瓶+样 = ${checkNull(m0r, m1r, '0') ? '0' : decimal.add(m0r, m1r).toString()}<br>
+                `
 
                 message(msg)
             })
@@ -141,6 +148,11 @@ ${m0r != '' && m1r != '' ? `第二组恒重后空瓶+样 = ${decimal.add(m0r, m1
             message(tip)
         }
 
+        function format(value) {
+            if (value <= 0) return `<span style="color: red;">${value}</span>`
+            return value
+        }
+
         // 需要导入哪些
         function importData(data) {
             io.exportData(data, $("input"))
@@ -180,32 +192,6 @@ ${m0r != '' && m1r != '' ? `第二组恒重后空瓶+样 = ${decimal.add(m0r, m1
             })
         }
 
-        // check storage available
-        function storageAvailable(type) {
-            let storage
-            try {
-                storage = window[type]
-                const x = '__storage_test__'
-                storage.setItem(x, x)
-                storage.removeItem(x)
-                return true
-            }
-            catch (e) {
-                return e instanceof DOMException && (
-                    // everything except Firefox
-                    e.code === 22 ||
-                    // Firefox
-                    e.code === 1014 ||
-                    // test name field too, because code might not be present
-                    // everything except Firefox
-                    e.name === 'QuotaExceededError' ||
-                    // Firefox
-                    e.name === 'NS_ERROR_DOM_QUOTA_REACHED') &&
-                    // acknowledge QuotaExceededError only if there's something already stored
-                    (storage && storage.length !== 0)
-            }
-        }
-
         function message(msg) {
             $(".msgbox").empty()
             $(".msgbox").append(msg)
@@ -264,26 +250,23 @@ ${m0r != '' && m1r != '' ? `第二组恒重后空瓶+样 = ${decimal.add(m0r, m1
 
 <body>
     <h3>干燥失重</h3>
-    <input type="text" name="lod-name" id="lod-name" list="keys" placeholder="样品批号"><br><br>
 
-    <div class="one-team">
-        第一组<br>
-        <input type="number" name="m0l" id="m0l" class="one-input m0" placeholder="恒重后空瓶重(1)" inputmode="decimal"><br>
-        <input type="number" name="m1l" id="m1l" class="one-input m1" placeholder="样品重(2)" inputmode="decimal"><br>
-        <input type="number" name="m3l" id="m3l" class="one-input m3" placeholder="干燥恒重后带样品重(3)"
-            inputmode="decimal"><br>
-        <br>
+    <input type="text" name="lod-name" id="lod-name" list="keys" placeholder="样品批号" style="width: 97%;">
+    <br><br>
+    <div class="container">
+        <span>第一组</span>
+        <span>第二组</span>
+
+        <input type="number" name="m0l" id="m0l" class="one-input m0" placeholder="恒重后空瓶重(1)" inputmode="decimal">
+        <input type="number" name="m0r" id="m0r" class="two-input m0" placeholder="恒重后空瓶重(1)" inputmode="decimal">
+
+        <input type="number" name="m1l" id="m1l" class="one-input m1" placeholder="样品重(2)" inputmode="decimal">
+        <input type="number" name="m1r" id="m1r" class="two-input m1" placeholder="样品重(2)" inputmode="decimal">
+
+        <input type="number" name="m3l" id="m3l" class="one-input m3" placeholder="干燥恒重后带样品重(3)" inputmode="decimal">
+        <input type="number" name="m3r" id="m3r" class="two-input m3" placeholder="干燥恒重后带样品重(3)" inputmode="decimal">
     </div>
-
-    <div class="two-team">
-        第二组<br>
-        <input type="number" name="m0r" id="m0r" class="two-input m0" placeholder="恒重后空瓶重(1)" inputmode="decimal"><br>
-        <input type="number" name="m1r" id="m1r" class="two-input m1" placeholder="样品重(2)" inputmode="decimal"><br>
-        <input type="number" name="m3r" id="m3r" class="two-input m3" placeholder="干燥恒重后带样品重(3)"
-            inputmode="decimal"><br>
-        <br>
-    </div>
-
+    <br>
     <div class="buttons">
         <button id="new_page">新开标签页</button>
         <button id="clear">清除内容</button>
diff --git a/views/roi.html b/views/roi.html
index 373db2d..a413bbb 100644
--- a/views/roi.html
+++ b/views/roi.html
@@ -8,6 +8,18 @@
     <title>炽灼残渣</title>
     <link rel="stylesheet" href="../statics/github.css">
     <link rel="stylesheet" href="../statics/theme.css">
+    <style>
+        .container {
+            display: grid;
+            grid-template-columns: 1fr 1fr;
+            column-gap: 2%
+        }
+
+        input {
+            width: auto;
+        }
+
+    </style>
     <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
     <script type="module">
         import { Decimal } from "../statics/modules/decimal.mjs"
@@ -21,12 +33,19 @@
         let debug = false
 
         let tip = `
-<br>
-操作过程：
-空坩埚 -> 灼烧3小时 -> 冷却称重 -> 灼烧0.5小时 -> 冷却称重(1)
--> 加样(2) -> 烧至无烟 -> 灼烧1小时 -> 冷却称重 -> 灼烧0.5小时 -> 冷却称重(3)
-<br>
-`
+            <br><b>操作过程：</b>
+            <br>&nbsp;&nbsp; 1. 空坩埚灼烧 3 小时
+            <br>&nbsp;&nbsp; 2. 冷却称重
+            <br>&nbsp;&nbsp; 3. 灼烧 0.5 小时
+            <br>&nbsp;&nbsp; 4. 冷却称重(1) 并加样(2)
+            <br>&nbsp;&nbsp; 5. 电热炉烧至无烟
+            <br>&nbsp;&nbsp; 6. 加硫酸再次烧至无烟
+            <br>&nbsp;&nbsp; 7. 灼烧 1 小时
+            <br>&nbsp;&nbsp; 8. 冷却称重
+            <br>&nbsp;&nbsp; 9. 灼烧 0.5 小时
+            <br>&nbsp;&nbsp;10. 冷却称重(3)
+            <br>
+        `
 
         $(document).ready(() => {
             $(".msgbox").append(tip)
@@ -211,25 +230,24 @@
 
 <body>
     <h3>炽灼残渣</h3>
-    <input type="text" name="roi-name" id="roi-name" list="keys" placeholder="样品批号"><br><br>
 
-    <div class="one-team">
-        第一组<br>
-        <input type="number" name="m0l" id="m0l" class="one-input m0" placeholder="恒重后空坩埚重(1)" inputmode="decimal"><br>
-        <input type="number" name="m1l" id="m1l" class="one-input m1" placeholder="样品重(2)" inputmode="decimal"><br>
-        <input type="number" name="m3l" id="m3l" class="one-input m3" placeholder="灼烧恒重后带样品重(3)"
-            inputmode="decimal"><br>
-        <br>
-    </div>
+    <input type="text" name="roi-name" id="roi-name" list="keys" placeholder="样品批号" style="width: 97%;">
+    <br><br>
 
-    <div class="two-team">
-        第二组<br>
-        <input type="number" name="m0r" id="m0r" class="two-input m0" placeholder="恒重后空坩埚重(1)" inputmode="decimal"><br>
-        <input type="number" name="m1r" id="m1r" class="two-input m1" placeholder="样品重(2)" inputmode="decimal"><br>
-        <input type="number" name="m3r" id="m3r" class="two-input m3" placeholder="灼烧恒重后带样品重(3)"
-            inputmode="decimal"><br>
-        <br>
+    <div class="container">
+        <span>第一组</span>
+        <span>第二组</span>
+
+        <input type="number" name="m0l" id="m0l" class="one-input m0" inputmode="decimal" placeholder="恒重后空坩埚重(1)">
+        <input type="number" name="m0r" id="m0r" class="two-input m0" inputmode="decimal" placeholder="恒重后空坩埚重(1)">
+
+        <input type="number" name="m1l" id="m1l" class="one-input m1" inputmode="decimal" placeholder="样品重(2)">
+        <input type="number" name="m1r" id="m1r" class="two-input m1" inputmode="decimal" placeholder="样品重(2)">
+
+        <input type="number" name="m3l" id="m3l" class="one-input m3" inputmode="decimal" placeholder="灼烧恒重后带样品重(3)">
+        <input type="number" name="m3r" id="m3r" class="two-input m3" inputmode="decimal" placeholder="灼烧恒重后带样品重(3)">
     </div>
+    <br>
 
     <div class="buttons">
         <button id="new_page">新开标签页</button>