+ 清空内容时须二次确认(仅适用于干燥失重与炽灼残渣)

+ 修改内容显示方式,使其更加友好
This commit is contained in:
2022-05-10 23:20:18 +08:00
parent 7c54b671b6
commit 8107427a2e
5 changed files with 41 additions and 37 deletions

View File

@@ -12,16 +12,16 @@
<body>
<div class="list">
<div class="item" onclick="window.location.href='./titer.html'">
标水(Titer)
标水
</div>
<div class="item" onclick="window.location.href='./lod.html'">
干燥失重(Lod)
干燥失重
</div>
<div class="item" onclick="window.location.href='./roi.html'">
炽灼残渣(Residue on Ignition)
炽灼残渣
</div>
<div class="item" onclick="window.location.href='./injection-sequence.html'">
进样序列(Injection Sequence)
进样序列
</div>
</div>
</body>

View File

@@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<title>进样序列(Injection Sequence)</title>
<title>进样序列</title>
<link rel="stylesheet" href="./github.css">
<link rel="stylesheet" href="./theme.css">
<script src="./decimal.js"></script>
@@ -108,6 +108,7 @@
</head>
<body>
<h3>进样序列</h3>
<div class="input">
<div class="inputbox">
<input type="number" name="time" id="time" placeholder="t = 多少分钟一针" inputmode="decimal" autocomplete="off">
@@ -124,6 +125,7 @@
<button id="clear">清除内容</button>
<button id="ok">计算</button>
</div>
<br>
</div>
<div id="output">

View File

@@ -55,25 +55,27 @@
var average = decimal.add(lod1, lod2).div(2).toString();
var msg = "<br>" +
"Lod1 = " + lod1 + "<br>" +
"Lod2 = " + lod2 + "<br>";
"第一组干燥失重 = " + lod1 + "<br>" +
"第二组干燥失重 = " + lod2 + "<br>" +
"两组干燥失重平均值 = " + average + "<br>";
if (m0l != '' && m1l != '') {
msg += "m0+m1(Lod1) = " + decimal.add(m0l, m1l).toString() + "<br>";
msg += "第一组恒重后空瓶+样 = " + decimal.add(m0l, m1l).toString() + "<br>";
}
if (m0r != '' && m1r != '') {
msg += "m0+m1(Lod2) = " + decimal.add(m0r, m1r).toString() + "<br>";
msg += "第二组恒重后空瓶+样 = " + decimal.add(m0r, m1r).toString() + "<br>";
}
msg += "Average(Lod1,Lod2) = " + average + "<br>";
message(msg);
});
$("#clear").click(function () {
var confirm = window.confirm("所填写的数据将被清空,确定?");
if (!confirm) {
return;
}
input_m0l.value = "";
input_m1l.value = "";
input_m3l.value = "";
@@ -130,10 +132,11 @@
</head>
<body>
<h3>干燥失重</h3>
<input type="text" name="lod-name" id="lod-name" placeholder="样品批号"><br><br>
<div class="one-team">
第一组Lod1<br>
第一组<br>
<input type="number" name="m0l" id="m0l" class="one-input m0" placeholder="m0" inputmode="decimal"><br>
<input type="number" name="m1l" id="m1l" class="one-input m1" placeholder="m1" inputmode="decimal"><br>
<input type="number" name="m3l" id="m3l" class="one-input m3" placeholder="m3" inputmode="decimal"><br>
@@ -141,7 +144,7 @@
</div>
<div class="two-team">
第二组Lod2<br>
第二组<br>
<input type="number" name="m0r" id="m0r" class="two-input m0" placeholder="m0" inputmode="decimal"><br>
<input type="number" name="m1r" id="m1r" class="two-input m1" placeholder="m1" inputmode="decimal"><br>
<input type="number" name="m3r" id="m3r" class="two-input m3" placeholder="m3" inputmode="decimal"><br>

View File

@@ -15,10 +15,10 @@
var tip = "<br>" +
"操作过程:" +
"<br>" +
"空 -> 灼烧3小时 -> 冷却称重(1) -> 灼烧0.5小时 -> 冷却称重(2-1) -> 加样(2-2) -> 烧至无烟 -> 灼烧1小时 -> 冷却称重(3) -> 灼烧0.5小时 -> 冷却称重(4)" +
"空坩埚 -> 灼烧3小时 -> 冷却称重(1) -> 灼烧0.5小时 -> 冷却称重(2-1) -> 加样(2-2) -> 烧至无烟 -> 灼烧1小时 -> 冷却称重(3) -> 灼烧0.5小时 -> 冷却称重(4)" +
"<br>" +
"<br>" +
"m0=恒重后空2-1<br>" +
"m0=恒重后空坩埚2-1<br>" +
"m1=样品重2-2<br>" +
"m3=灼烧恒重后带样品重4";
@@ -49,31 +49,31 @@
var m1r = input_m1r.value;
var m3r = input_m3r.value;
var lod1 = lod(m0l, m1l, m3l)
var lod2 = lod(m0r, m1r, m3r)
var average = decimal.add(lod1, lod2).div(2).toString();
var msg = "<br>" +
"Roi1 = " + lod1 + "<br>" +
"Roi2 = " + lod2 + "<br>";
"第一组炽灼残渣 = " + lod1 + "<br>" +
"第二组炽灼残渣 = " + lod2 + "<br>" +
"两组炽灼残渣平均值 = " + average + "<br>";
if (m0l != '' && m1l != '') {
msg += "m0+m1(Roi1) = " + decimal.add(m0l, m1l).toString() + "<br>";
msg += "第一组恒重后空坩埚+样 = " + decimal.add(m0l, m1l).toString() + "<br>";
}
if (m0r != '' && m1r != '') {
msg += "m0+m1(Roi2) = " + decimal.add(m0r, m1r).toString() + "<br>";
msg += "第二组恒重后空坩埚+样 = " + decimal.add(m0r, m1r).toString() + "<br>";
}
msg += "Average(Roi1,Roi2) = " + average + "<br>";
message(msg);
});
$("#clear").click(function () {
var confirm = window.confirm("所填写的数据将被清空,确定?");
if (!confirm) {
return;
}
input_m0l.value = "";
input_m1l.value = "";
input_m3l.value = "";
@@ -101,11 +101,11 @@
}
/**
* 计算干燥失重
* @param m0 恒重后空
* 计算炽灼残渣
* @param m0 恒重后空坩埚
* @param m1 样品重
* @param m3 干燥恒重后带样品重
* @return 干燥失重%
* @return 炽灼残渣%
*/
function lod(m0, m1, m3) {
if (checkNull(m0, m1, m3)) {
@@ -130,10 +130,11 @@
</head>
<body>
<h3>炽灼残渣</h3>
<input type="text" name="lod-name" id="lod-name" placeholder="样品批号"><br><br>
<div class="one-team">
第一组Roi1<br>
第一组<br>
<input type="number" name="m0l" id="m0l" class="one-input m0" placeholder="m0" inputmode="decimal"><br>
<input type="number" name="m1l" id="m1l" class="one-input m1" placeholder="m1" inputmode="decimal"><br>
<input type="number" name="m3l" id="m3l" class="one-input m3" placeholder="m3" inputmode="decimal"><br>
@@ -141,7 +142,7 @@
</div>
<div class="two-team">
第二组Roi2<br>
第二组<br>
<input type="number" name="m0r" id="m0r" class="two-input m0" placeholder="m0" inputmode="decimal"><br>
<input type="number" name="m1r" id="m1r" class="two-input m1" placeholder="m1" inputmode="decimal"><br>
<input type="number" name="m3r" id="m3r" class="two-input m3" placeholder="m3" inputmode="decimal"><br>

View File

@@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<title>标水(Titer)</title>
<title>标水</title>
<link rel="stylesheet" href="./github.css">
<link rel="stylesheet" href="./theme.css">
<script src="./decimal.js"></script>
@@ -40,14 +40,12 @@
var m2 = input_m2.value;
f = average(m0, m1, m2);
console.log("f=" + f);
var msg = "<br>" +
"F' = " + f + "<br>" +
"F值平均值 = " + f + "<br>" +
"RD1 = " + titer(f, m0) + "<br>" +
"RD2 = " + titer(f, m1) + "<br>" +
"RD3 = " + titer(f, m2) + "<br>"
;
"RD3 = " + titer(f, m2) + "<br>";
message(msg);
});
@@ -99,7 +97,7 @@
</head>
<body>
<h3>标水</h3>
<div class="team">
<input type="number" id="m0" class="m0" placeholder="F1" inputmode="decimal"><br>
<input type="number" id="m1" class="m1" placeholder="F2" inputmode="decimal"><br>